summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSarveshwar Bandi <sarveshwar.bandi@emulex.com>2013-04-25 00:56:56 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-29 12:33:47 -0400
commitb424332d0a812799b83ab6e1d3c8c32a3c5ecfb5 (patch)
tree57c9a3ded74fddf096735510d922b18762ad3072 /drivers/net
parentd98ef50fd99585e43b77b5ac5943e4450031a18e (diff)
downloadlinux-stable-b424332d0a812799b83ab6e1d3c8c32a3c5ecfb5.tar.gz
linux-stable-b424332d0a812799b83ab6e1d3c8c32a3c5ecfb5.tar.bz2
linux-stable-b424332d0a812799b83ab6e1d3c8c32a3c5ecfb5.zip
be2net: Fix to show wol disabled/enabled state correctly.
Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 76b302f30c87..1b7233c11af3 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -680,7 +680,8 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
if (be_is_wol_supported(adapter)) {
wol->supported |= WAKE_MAGIC;
- wol->wolopts |= WAKE_MAGIC;
+ if (adapter->wol)
+ wol->wolopts |= WAKE_MAGIC;
} else
wol->wolopts = 0;
memset(&wol->sopass, 0, sizeof(wol->sopass));