[kernel] r16969 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Wed Mar  2 23:28:57 2011
New Revision: 16969

Log:
netxen: fix set mac addr.

already fwd to stable.

Reported-by: Julien-externe BLACHE <julien-externe.blache at edf.fr>
Signed-off-by: maximilian attems <max at stro.at>

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/netxen-fix-set-mac-addr.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/31

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Mar  2 16:16:35 2011	(r16968)
+++ dists/squeeze/linux-2.6/debian/changelog	Wed Mar  2 23:28:57 2011	(r16969)
@@ -74,6 +74,7 @@
     - xhci: Fix errors in the running total calculations in the TRB math
     - xhci: Fix an error in count_sg_trbs_needed()
     - x25: Do not reference freed memory
+  * netxen: fix set mac addr. (closes: #616058)
 
   [ Aurelien Jarno ]
   * init: fix race between init and kthreadd, fixes a kernel panic on 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/netxen-fix-set-mac-addr.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/netxen-fix-set-mac-addr.patch	Wed Mar  2 23:28:57 2011	(r16969)
@@ -0,0 +1,34 @@
+From: Amit Kumar Salecha <amit.salecha at qlogic.com>
+Date: Thu, 7 Jan 2010 22:10:16 +0000
+Subject: [PATCH] netxen: fix set mac addr
+
+commit d49c9640975355c79f346869831bf9780d185de0 upstream.
+
+o If tx and rx resources are not available, during set mac request.
+  Then this request wont be passed to firmware and it will be added to
+  driver mac list and will never make it to firmware.
+  So if resources are not available, don't add it to driver mac list.
+
+Signed-off-by: Amit Kumar Salecha <amit.salecha at qlogic.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/netxen/netxen_nic_hw.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
+index 398dfd4..85e28e6 100644
+--- a/drivers/net/netxen/netxen_nic_hw.c
++++ b/drivers/net/netxen/netxen_nic_hw.c
+@@ -690,6 +690,9 @@ void netxen_p3_nic_set_multi(struct net_device *netdev)
+ 	struct list_head *head;
+ 	nx_mac_list_t *cur;
+ 
++	if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
++		return;
++
+ 	list_splice_tail_init(&adapter->mac_list, &del_list);
+ 
+ 	nx_p3_nic_add_mac(adapter, adapter->mac_addr, &del_list);
+-- 
+1.7.2.3
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Wed Mar  2 16:16:35 2011	(r16968)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Wed Mar  2 23:28:57 2011	(r16969)
@@ -42,3 +42,4 @@
 - bugfix/all/fix-pktcdvd-ioctl-dev_minor-range-check.patch
 - bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch
 + bugfix/all/stable/2.6.32.30.patch
++ bugfix/all/netxen-fix-set-mac-addr.patch