Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f5785ec 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: (89 commits)
  bonding: documentation and code cleanup for resend_igmp
  bonding: prevent deadlock on slave store with alb mode (v3)
  net: hold rtnl again in dump callbacks
  Add Fujitsu 1000base-SX PCI ID to tg3
  bnx2x: protect sequence increment with mutex
  sch_sfq: fix peek() implementation
  isdn: netjet - blacklist Digium TDM400P
  via-velocity: don't annotate MAC registers as packed
  xen: netfront: hold RTNL when updating features.
  sctp: fix memory leak of the ASCONF queue when free asoc
  net: make dev_disable_lro use physical device if passed a vlan dev (v2)
  net: move is_vlan_dev into public header file (v2)
  bug.h: Fix build with CONFIG_PRINTK disabled.
  wireless: fix fatal kernel-doc error + warning in mac80211.h
  wireless: fix cfg80211.h new kernel-doc warnings
  iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
  dst: catch uninitialized metrics
  be2net: hash key for rss-config cmd not set
  bridge: initialize fake_rtable metrics
  net: fix __dst_destroy_metrics_generic()
  ...

Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
parents 8c1c77ff 94265cf5

Documentation/networking/bonding.txt

+11 −2
Original line number Diff line number Diff line
@@ -770,8 +770,17 @@ resend_igmp 
	a failover event. One membership report is issued immediately after

	the failover, subsequent packets are sent in each 200ms interval.



	The valid range is 0 - 255; the default value is 1. This option

	was added for bonding version 3.7.0.

	The valid range is 0 - 255; the default value is 1. A value of 0

	prevents the IGMP membership report from being issued in response

	to the failover event.



	This option is useful for bonding modes balance-rr (0), active-backup

	(1), balance-tlb (5) and balance-alb (6), in which a failover can

	switch the IGMP traffic from one slave to another.  Therefore a fresh

	IGMP report must be issued to cause the switch to forward the incoming

	IGMP traffic over the newly selected slave.



	This option was added for bonding version 3.7.0.



3. Configuring Bonding Devices

==============================

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static void bcma_host_pci_remove(struct pci_dev *dev) 
}



static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

drivers/isdn/hardware/mISDN/netjet.c

+6 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,12 @@ nj_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		return -ENODEV;

	}



	if (pdev->subsystem_vendor == 0xb100 &&

	    pdev->subsystem_device == 0x0003 ) {

		pr_notice("Netjet: Digium TDM400P not handled yet\n");

		return -ENODEV;

	}



	card = kzalloc(sizeof(struct tiger_hw), GFP_ATOMIC);

	if (!card) {

		pr_info("No kmem for Netjet\n");

drivers/net/benet/be_cmds.c

+2 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,8 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, u16 table_size) 
{

	struct be_mcc_wrb *wrb;

	struct be_cmd_req_rss_config *req;

	u32 myhash[10];

	u32 myhash[10] = {0x0123, 0x4567, 0x89AB, 0xCDEF, 0x01EF,

			0x0123, 0x4567, 0x89AB, 0xCDEF, 0x01EF};

	int status;



	if (mutex_lock_interruptible(&adapter->mbox_lock))

drivers/net/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -2675,7 +2675,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index) 
	 * Min size diferent for TPA and non-TPA queues

	 */

	if (ring_size < (fp->disable_tpa ?

				MIN_RX_SIZE_TPA : MIN_RX_SIZE_NONTPA)) {

				MIN_RX_SIZE_NONTPA : MIN_RX_SIZE_TPA)) {

			/* release memory allocated for this queue */

			bnx2x_free_fp_mem_at(bp, index);

			return -ENOMEM;