Commit b868179c authored by Dean Nelson's avatar Dean Nelson Committed by Jeff Kirsher

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: default avatarTobias Klausmann <klausman@schwarzvogel.de>
Signed-off-by: default avatarDean Nelson <dnelson@redhat.com>
Tested-by: default avatarTobias Klausmann <klausman@schwarzvogel.de>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 64db880e
...@@ -4740,12 +4740,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) ...@@ -4740,12 +4740,14 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake)
e1000_setup_rctl(adapter); e1000_setup_rctl(adapter);
e1000_set_rx_mode(netdev); e1000_set_rx_mode(netdev);
rctl = er32(RCTL);
/* turn on all-multi mode if wake on multicast is enabled */ /* turn on all-multi mode if wake on multicast is enabled */
if (wufc & E1000_WUFC_MC) { if (wufc & E1000_WUFC_MC)
rctl = er32(RCTL);
rctl |= E1000_RCTL_MPE; rctl |= E1000_RCTL_MPE;
ew32(RCTL, rctl);
} /* enable receives in the hardware */
ew32(RCTL, rctl | E1000_RCTL_EN);
if (hw->mac_type >= e1000_82540) { if (hw->mac_type >= e1000_82540) {
ctrl = er32(CTRL); ctrl = er32(CTRL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment