aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2009-11-09 21:04:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-10 16:21:16 -0500
commitc3b866ad7ef9a74fc2e0d7f0c5520ad09c8536f3 (patch)
treed071658582974410c2726e2e6df66885cacd8f3f /drivers
parent866d4700150656b928f366c395bab9ab0e1a06a3 (diff)
Libertas: fix issues while configuring host sleep using ethtool wol
Configuration of wake-on-lan for unicast, multicast, broadcast, physical activity was not working. Kernel panic issue was there when user tries to disable WOL. Fixed them. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/ethtool.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 6efa3882d0a6..53d56ab83c03 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -169,9 +169,6 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
169 struct lbs_private *priv = dev->ml_priv; 169 struct lbs_private *priv = dev->ml_priv;
170 uint32_t criteria = 0; 170 uint32_t criteria = 0;
171 171
172 if (priv->wol_criteria == 0xffffffff && wol->wolopts)
173 return -EOPNOTSUPP;
174
175 if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY)) 172 if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
176 return -EOPNOTSUPP; 173 return -EOPNOTSUPP;
177 174
@@ -183,6 +180,8 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
183 criteria |= EHS_WAKE_ON_BROADCAST_DATA; 180 criteria |= EHS_WAKE_ON_BROADCAST_DATA;
184 if (wol->wolopts & WAKE_PHY) 181 if (wol->wolopts & WAKE_PHY)
185 criteria |= EHS_WAKE_ON_MAC_EVENT; 182 criteria |= EHS_WAKE_ON_MAC_EVENT;
183 if (wol->wolopts == 0)
184 criteria |= EHS_REMOVE_WAKEUP;
186 185
187 return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL); 186 return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);
188} 187}