diff options
author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-06-05 07:30:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-08 09:31:20 -0400 |
commit | 84efa0e7aab9f41451bdf4bff5e2414bb59c6a93 (patch) | |
tree | ccabc600c6c4ef5772995b48c6ee58fc21094dd6 /drivers/net/wireless/libertas | |
parent | a5fdbcad0a3f461d43f7b801f8fc176cd2840704 (diff) |
libertas: Fix ethtool reporting no WOL options supported if WOL is not already active
This patch fixes the libertas driver incorrectly reporting that Wake-on-LAN
is not supported if Wake-on-LAN is currently disabled.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/ethtool.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c index 6a36c9956fdc..0cf31bbf6567 100644 --- a/drivers/net/wireless/libertas/ethtool.c +++ b/drivers/net/wireless/libertas/ethtool.c | |||
@@ -69,14 +69,11 @@ static void lbs_ethtool_get_wol(struct net_device *dev, | |||
69 | { | 69 | { |
70 | struct lbs_private *priv = dev->ml_priv; | 70 | struct lbs_private *priv = dev->ml_priv; |
71 | 71 | ||
72 | if (priv->wol_criteria == 0xffffffff) { | ||
73 | /* Interface driver didn't configure wake */ | ||
74 | wol->supported = wol->wolopts = 0; | ||
75 | return; | ||
76 | } | ||
77 | |||
78 | wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY; | 72 | wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY; |
79 | 73 | ||
74 | if (priv->wol_criteria == EHS_REMOVE_WAKEUP) | ||
75 | return; | ||
76 | |||
80 | if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA) | 77 | if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA) |
81 | wol->wolopts |= WAKE_UCAST; | 78 | wol->wolopts |= WAKE_UCAST; |
82 | if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA) | 79 | if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA) |