Commit c3b866ad authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville

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: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 866d4700
...@@ -169,9 +169,6 @@ static int lbs_ethtool_set_wol(struct net_device *dev, ...@@ -169,9 +169,6 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
struct lbs_private *priv = dev->ml_priv; struct lbs_private *priv = dev->ml_priv;
uint32_t criteria = 0; uint32_t criteria = 0;
if (priv->wol_criteria == 0xffffffff && wol->wolopts)
return -EOPNOTSUPP;
if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY)) if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -183,6 +180,8 @@ static int lbs_ethtool_set_wol(struct net_device *dev, ...@@ -183,6 +180,8 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
criteria |= EHS_WAKE_ON_BROADCAST_DATA; criteria |= EHS_WAKE_ON_BROADCAST_DATA;
if (wol->wolopts & WAKE_PHY) if (wol->wolopts & WAKE_PHY)
criteria |= EHS_WAKE_ON_MAC_EVENT; criteria |= EHS_WAKE_ON_MAC_EVENT;
if (wol->wolopts == 0)
criteria |= EHS_REMOVE_WAKEUP;
return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL); return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment