Commit b868179c authored Jan 19, 2012 by Dean Nelson Committed by Jeff Kirsher Feb 09, 2012

e1000: add dropped DMA receive enable back in for WoL



Commit d5bc77a2 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@vger.stable.org
Reported-by: Tobias Klausmann <klausman@schwarzvogel.de>
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Tested-by: Tobias Klausmann <klausman@schwarzvogel.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 64db880e

drivers/net/ethernet/intel/e1000/e1000_main.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -4740,12 +4740,14 @@ static int __e1000_shutdown(struct pci_dev pdev, bool enable_wake)
		e1000_setup_rctl(adapter);
		e1000_set_rx_mode(netdev);

		/* turn on all-multi mode if wake on multicast is enabled */
		if (wufc & E1000_WUFC_MC) {
		rctl = er32(RCTL);

		/* turn on all-multi mode if wake on multicast is enabled */
		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);