diff mbox

[net-next] e1000: add dropped DMA receive enable back in for WoL

Message ID 20120118154633.10215.19965.email-sent-by-dnelson@aqua
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Dean Nelson Jan. 18, 2012, 3:46 p.m. UTC 
None

Comments

Kirsher, Jeffrey T Jan. 19, 2012, 9:42 a.m. UTC | #1 
On Wed, 2012-01-18 at 10:46 -0500, Dean Nelson wrote:
> Commit d5bc77a223b0e9b9dfb002048d2b34a79e7d0b48 broke Wake-on-LAN by
> inadvertently dropping the enabling of DMA receives.
> 
> Restore the enabling of DMA receives for WoL.
> 
> Reported-by: Tobias Klausmann <klausman@schwarzvogel.de>
> Signed-off-by: Dean Nelson <dnelson@redhat.com>
> Tested-by: Tobias Klausmann <klausman@schwarzvogel.de>
> ---
>  drivers/net/ethernet/intel/e1000/e1000_main.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-) 

Thanks, I have added the patch to my queue.
diff mbox

Patch

Commit d5bc77a223b0e9b9dfb002048d2b34a79e7d0b48 broke Wake-on-LAN by
inadvertently dropping the enabling of DMA receives.

Restore the enabling of DMA receives for WoL.

Reported-by: Tobias Klausmann <klausman@schwarzvogel.de>
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Tested-by: Tobias Klausmann <klausman@schwarzvogel.de>
---
 drivers/net/ethernet/intel/e1000/e1000_main.c |   10 ++++++----
 1 files 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..a855982 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);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html