[kernel] r19319 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Sun Aug 12 21:27:01 2012
New Revision: 19319

Log:
e1000: add dropped DMA receive enable back in for WoL (Closes: #684618)

Added:
   dists/sid/linux/debian/patches/bugfix/all/e1000-add-dropped-DMA-receive-enable-back-in-for-WoL.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Aug 12 16:51:56 2012	(r19318)
+++ dists/sid/linux/debian/changelog	Sun Aug 12 21:27:01 2012	(r19319)
@@ -88,6 +88,7 @@
   * [rt] Update to 3.2.26-rt39:
     - time/rt: Fix up leap-second backport for RT changes
   * rds: set correct msg_namelen (CVE-2012-3430)
+  * e1000: add dropped DMA receive enable back in for WoL (Closes: #684618)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 24 Jul 2012 02:20:37 +0100
 

Added: dists/sid/linux/debian/patches/bugfix/all/e1000-add-dropped-DMA-receive-enable-back-in-for-WoL.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/e1000-add-dropped-DMA-receive-enable-back-in-for-WoL.patch	Sun Aug 12 21:27:01 2012	(r19319)
@@ -0,0 +1,46 @@
+From: Dean Nelson <dnelson at redhat.com>
+Date: Thu, 19 Jan 2012 17:47:24 +0000
+Subject: e1000: add dropped DMA receive enable back in for WoL
+
+commit b868179c47e9e8eadcd04c1f3105998e528988a3 upstream.
+
+Commit d5bc77a223b0e9b9dfb002048d2b34a79e7d0b48 broke Wake-on-LAN by
+inadvertently dropping the enabling of DMA receives.
+
+Restore the enabling of DMA receives for WoL.
+
+This is applicable to 3.1+ stable trees.
+
+CC: stable at vger.stable.org
+Reported-by: Tobias Klausmann <klausman at schwarzvogel.de>
+Signed-off-by: Dean Nelson <dnelson at redhat.com>
+Tested-by: Tobias Klausmann <klausman at schwarzvogel.de>
+Tested-by: Aaron Brown <aaron.f.brown at intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
+---
+ drivers/net/ethernet/intel/e1000/e1000_main.c |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
+index 669ca38..d94d64b 100644
+--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
++++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
+@@ -4740,12 +4740,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
+ 		e1000_setup_rctl(adapter);
+ 		e1000_set_rx_mode(netdev);
+ 
++		rctl = er32(RCTL);
++
+ 		/* turn on all-multi mode if wake on multicast is enabled */
+-		if (wufc & E1000_WUFC_MC) {
+-			rctl = er32(RCTL);
++		if (wufc & E1000_WUFC_MC)
+ 			rctl |= E1000_RCTL_MPE;
+-			ew32(RCTL, rctl);
+-		}
++
++		/* enable receives in the hardware */
++		ew32(RCTL, rctl | E1000_RCTL_EN);
+ 
+ 		if (hw->mac_type >= e1000_82540) {
+ 			ctrl = er32(CTRL);

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Aug 12 16:51:56 2012	(r19318)
+++ dists/sid/linux/debian/patches/series	Sun Aug 12 21:27:01 2012	(r19319)
@@ -388,3 +388,4 @@
 features/all/bql/skge-add-byte-queue-limit-support.patch
 
 bugfix/all/rds-set-correct-msg_namelen.patch
+bugfix/all/e1000-add-dropped-DMA-receive-enable-back-in-for-WoL.patch