openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

e1000e: do not suggest the driver supports Wake-on-ARP 

The driver doesn't support Wake-on-ARP, so don't advertise through ethtool
that it does.

Cleanup some coding style issues in the same functions.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Bruce Allan 2011-03-04 09:07:01 +00:00 committed by Jeff Kirsher
parent 23e4f06130
commit 4a29e15515
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/e1000e/ethtool.c
View File

@ -1799,8 +1799,7 @@ static void e1000_get_wol(struct net_device *netdev,
return; return;
wol->supported = WAKE_UCAST | WAKE_MCAST | wol->supported = WAKE_UCAST | WAKE_MCAST |
WAKE_BCAST | WAKE_MAGIC | WAKE_BCAST | WAKE_MAGIC | WAKE_PHY;
WAKE_PHY | WAKE_ARP;
/* apply any specific unsupported masks here */ /* apply any specific unsupported masks here */
if (adapter->flags & FLAG_NO_WAKE_UCAST) { if (adapter->flags & FLAG_NO_WAKE_UCAST) {
@ -1821,19 +1820,16 @@ static void e1000_get_wol(struct net_device *netdev,
wol->wolopts |= WAKE_MAGIC; wol->wolopts |= WAKE_MAGIC;
if (adapter->wol & E1000_WUFC_LNKC) if (adapter->wol & E1000_WUFC_LNKC)
wol->wolopts |= WAKE_PHY; wol->wolopts |= WAKE_PHY;
if (adapter->wol & E1000_WUFC_ARP)
wol->wolopts |= WAKE_ARP;
} }
static int e1000_set_wol(struct net_device *netdev, static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
struct ethtool_wolinfo *wol)
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
if (!(adapter->flags & FLAG_HAS_WOL) || if (!(adapter->flags & FLAG_HAS_WOL) ||
!device_can_wakeup(&adapter->pdev->dev) || !device_can_wakeup(&adapter->pdev->dev) ||
(wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
WAKE_MAGIC | WAKE_PHY | WAKE_ARP))) WAKE_MAGIC | WAKE_PHY)))
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* these settings will always override what we currently have */ /* these settings will always override what we currently have */
@ -1849,8 +1845,6 @@ static int e1000_set_wol(struct net_device *netdev,
adapter->wol |= E1000_WUFC_MAG; adapter->wol |= E1000_WUFC_MAG;
if (wol->wolopts & WAKE_PHY) if (wol->wolopts & WAKE_PHY)
adapter->wol |= E1000_WUFC_LNKC; adapter->wol |= E1000_WUFC_LNKC;
if (wol->wolopts & WAKE_ARP)
adapter->wol |= E1000_WUFC_ARP;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);