|
@@ -1812,7 +1812,8 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|
struct igb_adapter *adapter = netdev_priv(netdev);
|
|
struct igb_adapter *adapter = netdev_priv(netdev);
|
|
|
|
|
|
wol->supported = WAKE_UCAST | WAKE_MCAST |
|
|
wol->supported = WAKE_UCAST | WAKE_MCAST |
|
|
- WAKE_BCAST | WAKE_MAGIC;
|
|
|
|
|
|
+ WAKE_BCAST | WAKE_MAGIC |
|
|
|
|
+ WAKE_PHY;
|
|
wol->wolopts = 0;
|
|
wol->wolopts = 0;
|
|
|
|
|
|
/* this function will set ->supported = 0 and return 1 if wol is not
|
|
/* this function will set ->supported = 0 and return 1 if wol is not
|
|
@@ -1835,15 +1836,15 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|
wol->wolopts |= WAKE_BCAST;
|
|
wol->wolopts |= WAKE_BCAST;
|
|
if (adapter->wol & E1000_WUFC_MAG)
|
|
if (adapter->wol & E1000_WUFC_MAG)
|
|
wol->wolopts |= WAKE_MAGIC;
|
|
wol->wolopts |= WAKE_MAGIC;
|
|
-
|
|
|
|
- return;
|
|
|
|
|
|
+ if (adapter->wol & E1000_WUFC_LNKC)
|
|
|
|
+ wol->wolopts |= WAKE_PHY;
|
|
}
|
|
}
|
|
|
|
|
|
static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|
static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|
{
|
|
{
|
|
struct igb_adapter *adapter = netdev_priv(netdev);
|
|
struct igb_adapter *adapter = netdev_priv(netdev);
|
|
|
|
|
|
- if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE))
|
|
|
|
|
|
+ if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))
|
|
return -EOPNOTSUPP;
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
if (igb_wol_exclusion(adapter, wol) ||
|
|
if (igb_wol_exclusion(adapter, wol) ||
|
|
@@ -1861,6 +1862,8 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
|
adapter->wol |= E1000_WUFC_BC;
|
|
adapter->wol |= E1000_WUFC_BC;
|
|
if (wol->wolopts & WAKE_MAGIC)
|
|
if (wol->wolopts & WAKE_MAGIC)
|
|
adapter->wol |= E1000_WUFC_MAG;
|
|
adapter->wol |= E1000_WUFC_MAG;
|
|
|
|
+ if (wol->wolopts & WAKE_PHY)
|
|
|
|
+ adapter->wol |= E1000_WUFC_LNKC;
|
|
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
|
|
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
|
|
|
|
|
|
return 0;
|
|
return 0;
|