aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2009-11-09 21:04:12 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-10 16:21:15 -0500
commit866d4700150656b928f366c395bab9ab0e1a06a3 (patch)
tree076c0bf60918781b43d1aa02730bf36fdb852c59
parent3da0d662e3911ca8345f049627533eeb1a2f820a (diff)
Libertas: coding style cleanup in ethtool.c
Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/ethtool.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
index 039b555e4d76..6efa3882d0a6 100644
--- a/drivers/net/wireless/libertas/ethtool.c
+++ b/drivers/net/wireless/libertas/ethtool.c
@@ -175,10 +175,14 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
175 if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY)) 175 if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
176 return -EOPNOTSUPP; 176 return -EOPNOTSUPP;
177 177
178 if (wol->wolopts & WAKE_UCAST) criteria |= EHS_WAKE_ON_UNICAST_DATA; 178 if (wol->wolopts & WAKE_UCAST)
179 if (wol->wolopts & WAKE_MCAST) criteria |= EHS_WAKE_ON_MULTICAST_DATA; 179 criteria |= EHS_WAKE_ON_UNICAST_DATA;
180 if (wol->wolopts & WAKE_BCAST) criteria |= EHS_WAKE_ON_BROADCAST_DATA; 180 if (wol->wolopts & WAKE_MCAST)
181 if (wol->wolopts & WAKE_PHY) criteria |= EHS_WAKE_ON_MAC_EVENT; 181 criteria |= EHS_WAKE_ON_MULTICAST_DATA;
182 if (wol->wolopts & WAKE_BCAST)
183 criteria |= EHS_WAKE_ON_BROADCAST_DATA;
184 if (wol->wolopts & WAKE_PHY)
185 criteria |= EHS_WAKE_ON_MAC_EVENT;
182 186
183 return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL); 187 return lbs_host_sleep_cfg(priv, criteria, (struct wol_config *)NULL);
184} 188}