diff options
Diffstat (limited to 'drivers/net/atl1e')
-rw-r--r-- | drivers/net/atl1e/atl1e_ethtool.c | 2 | ||||
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index cdc3b85b10b9..619c6583e1aa 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c | |||
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
355 | struct atl1e_adapter *adapter = netdev_priv(netdev); | 355 | struct atl1e_adapter *adapter = netdev_priv(netdev); |
356 | 356 | ||
357 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | | 357 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | |
358 | WAKE_MCAST | WAKE_BCAST | WAKE_MCAST)) | 358 | WAKE_UCAST | WAKE_MCAST | WAKE_BCAST)) |
359 | return -EOPNOTSUPP; | 359 | return -EOPNOTSUPP; |
360 | /* these settings will always override what we currently have */ | 360 | /* these settings will always override what we currently have */ |
361 | adapter->wol = 0; | 361 | adapter->wol = 0; |
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 82d7be1655d3..7685b995ff9b 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) | |||
2232 | 2232 | ||
2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
2234 | 2234 | ||
2235 | if (netif_running(netdev)) | 2235 | if (netif_running(netdev)) { |
2236 | err = atl1e_request_irq(adapter); | 2236 | err = atl1e_request_irq(adapter); |
2237 | if (err) | 2237 | if (err) |
2238 | return err; | 2238 | return err; |
2239 | } | ||
2239 | 2240 | ||
2240 | atl1e_reset_hw(&adapter->hw); | 2241 | atl1e_reset_hw(&adapter->hw); |
2241 | 2242 | ||