Commit 29ef0117 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
  bridge: Fix LRO crash with tun
  IPv6: fix to set device name when new IPv6 over IPv6 tunnel device is created.
  gianfar: Fix boot hangs while bringing up gianfar ethernet
  netfilter: xt_sctp: sctp chunk mapping doesn't work
  netfilter: ctnetlink: fix echo if not subscribed to any multicast group
  netfilter: ctnetlink: allow changing NAT sequence adjustment in creation
  netfilter: nf_conntrack_ipv6: don't track ICMPv6 negotiation message
  netfilter: fix tuple inversion for Node information request
  netxen: fix msi-x interrupt handling
  de2104x: force correct order when writing to rx ring
  tun: Fix unicast filter overflow
  drivers/isdn: introduce missing kfree
  drivers/atm: introduce missing kfree
  sunhme: Don't match PCI devices in SBUS probe.
  9p: fix endian issues [attempt 3]
  net_dma: call dmaengine_get only if NET_DMA enabled
  3c509: Fix resume from hibernation for PnP mode.
  sungem: Soft lockup in sungem on Netra AC200 when switching interface up
  RxRPC: Fix a potential NULL dereference
  r8169: Don't update statistics counters when interface is down
  ...
parents 5a6fe125 4906f998

drivers/atm/solos-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -685,6 +685,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) 
 out_release_regions:

	pci_release_regions(dev);

 out:

	kfree(card);

	return err;

}

drivers/isdn/hardware/mISDN/hfcmulti.c

+2 −0
Original line number Diff line number Diff line
@@ -4599,6 +4599,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m) 
			printk(KERN_ERR "%s: no memory for coeffs\n",

			    __func__);

			ret = -ENOMEM;

			kfree(bch);

			goto free_chan;

		}

		bch->nr = ch;
@@ -4767,6 +4768,7 @@ init_multi_port(struct hfc_multi *hc, int pt) 
			printk(KERN_ERR "%s: no memory for coeffs\n",

			    __func__);

			ret = -ENOMEM;

			kfree(bch);

			goto free_chan;

		}

		bch->nr = ch + 1;

drivers/net/3c509.c

+1 −0
Original line number Diff line number Diff line
@@ -1475,6 +1475,7 @@ el3_resume(struct device *pdev) 
	spin_lock_irqsave(&lp->lock, flags);



	outw(PowerUp, ioaddr + EL3_CMD);

	EL3WINDOW(0);

	el3_up(dev);



	if (netif_running(dev))

drivers/net/gianfar.c

+6 −0
Original line number Diff line number Diff line
@@ -1629,6 +1629,12 @@ static void gfar_schedule_cleanup(struct net_device *dev) 
	if (netif_rx_schedule_prep(&priv->napi)) {

		gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);

		__netif_rx_schedule(&priv->napi);

	} else {

		/*

		 * Clear IEVENT, so interrupts aren't called again

		 * because of the packets that have already arrived.

		 */

		gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK);

	}



	spin_unlock(&priv->rxlock);

drivers/net/netxen/netxen_nic.h

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ typedef struct { 
#define NETXEN_IS_MSI_FAMILY(adapter) \

	((adapter)->flags & (NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED))



#define MSIX_ENTRIES_PER_ADAPTER	8

#define MSIX_ENTRIES_PER_ADAPTER	1

#define NETXEN_MSIX_TBL_SPACE		8192

#define NETXEN_PCI_REG_MSIX_TBL		0x44

CRA Git | Maintained and supported by SUSTech CRA and CCSE