[kernel] r17924 - in dists/squeeze/linux-2.6/debian: . patches/features/all/e1000e patches/series

[Ben Hutchings]

Author: benh
Date: Mon Aug 15 00:16:47 2011
New Revision: 17924

Log:
e1000e: Fix selection of alternate MAC address on device id 0x1060 (regression in 2.6.34)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/e1000e/0167-e1000e-alternate-mac-address-does-not-work-on-device-id-0x1060.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/36

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Aug 15 00:11:56 2011	(r17923)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Aug 15 00:16:47 2011	(r17924)
@@ -40,6 +40,8 @@
   * e1000e: Backport changes up to Linux 2.6.38 (Closes: #627700)
     - Add support for i82567V-4 and i82579
     - Fix support for i82577, i82578 and i82583
+  * e1000e: Fix selection of alternate MAC address on device id 0x1060
+    (regression in 2.6.34)
   * igb,igbvf: Backport changes up to Linux 3.0 (Closes: #627702)
     - Add support for i82576-ET2, i82580, DH89xxCC, i340 and i350
   * r8169: Backport changes up to Linux 2.6.38 (Closes: #627704)

Added: dists/squeeze/linux-2.6/debian/patches/features/all/e1000e/0167-e1000e-alternate-mac-address-does-not-work-on-device-id-0x1060.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/e1000e/0167-e1000e-alternate-mac-address-does-not-work-on-device-id-0x1060.patch	Mon Aug 15 00:16:47 2011	(r17924)
@@ -0,0 +1,32 @@
+From c407bee8a56d874b91f3e4ee790660959ff1a25e Mon Sep 17 00:00:00 2001
+From: Bruce Allan <bruce.w.allan at intel.com>
+Date: Fri, 22 Jul 2011 06:21:51 +0000
+Subject: e1000e: alternate MAC address does not work on device id 0x1060
+
+From: Bruce Allan <bruce.w.allan at intel.com>
+
+commit c407bee8a56d874b91f3e4ee790660959ff1a25e upstream.
+
+This issue is present all the way back to 2.6.34 kernels.
+
+Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
+Tested-by: Jeffrey Pieper <jeffrey.e.pieper at intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/e1000e/lib.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/e1000e/lib.c
++++ b/drivers/net/e1000e/lib.c
+@@ -190,7 +190,8 @@ s32 e1000_check_alt_mac_addr_generic(str
+ 	/* Check for LOM (vs. NIC) or one of two valid mezzanine cards */
+ 	if (!((nvm_data & NVM_COMPAT_LOM) ||
+ 	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_DUAL) ||
+-	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD)))
++	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES_QUAD) ||
++	      (hw->adapter->pdev->device == E1000_DEV_ID_82571EB_SERDES)))
+ 		goto out;
+ 
+ 	ret_val = e1000_read_nvm(hw, NVM_ALT_MAC_ADDR_PTR, 1,

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Mon Aug 15 00:11:56 2011	(r17923)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Mon Aug 15 00:16:47 2011	(r17924)
@@ -190,6 +190,7 @@
 + features/all/e1000e/0164-e1000e-tx_timeout-should-not-increment-for-non-hang-.patch
 + features/all/e1000e/0165-e1000e-check-down-flag-in-tasks.patch
 + features/all/e1000e/0166-e1000e-flush-all-writebacks-before-unload.patch
++ features/all/e1000e/0167-e1000e-alternate-mac-address-does-not-work-on-device-id-0x1060.patch
 + features/all/igb/0001-net-Convert-ethtool-get_stats-self_test-_count-ops-t.patch
 + features/all/igb/0002-igb-remove-unused-temp-variable-from-stats-clearing-.patch
 + features/all/igb/0003-igb-update-comments-for-serdes-config-and-update-to-.patch