diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2008-03-26 04:57:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-27 16:03:19 -0400 |
commit | c2b310a73b62f074b0019b940417cafbdbafde41 (patch) | |
tree | 186c947bf862262c81ecbc654cbe9a7bf02d50cf /drivers/net/wireless/libertas/main.c | |
parent | 69dc5d9da5c499c23db7b80217023403da103816 (diff) |
libertas: kill useless #define LBS_MONITOR_OFF 0
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 1eb0cb0a82b7..dac72f7af701 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -277,10 +277,10 @@ static ssize_t lbs_rtap_set(struct device *dev, | |||
277 | struct lbs_private *priv = to_net_dev(dev)->priv; | 277 | struct lbs_private *priv = to_net_dev(dev)->priv; |
278 | 278 | ||
279 | sscanf(buf, "%x", &monitor_mode); | 279 | sscanf(buf, "%x", &monitor_mode); |
280 | if (monitor_mode != LBS_MONITOR_OFF) { | 280 | if (monitor_mode) { |
281 | if(priv->monitormode == monitor_mode) | 281 | if (priv->monitormode == monitor_mode) |
282 | return strlen(buf); | 282 | return strlen(buf); |
283 | if (priv->monitormode == LBS_MONITOR_OFF) { | 283 | if (!priv->monitormode) { |
284 | if (priv->infra_open || priv->mesh_open) | 284 | if (priv->infra_open || priv->mesh_open) |
285 | return -EBUSY; | 285 | return -EBUSY; |
286 | if (priv->mode == IW_MODE_INFRA) | 286 | if (priv->mode == IW_MODE_INFRA) |
@@ -293,9 +293,9 @@ static ssize_t lbs_rtap_set(struct device *dev, | |||
293 | } | 293 | } |
294 | 294 | ||
295 | else { | 295 | else { |
296 | if (priv->monitormode == LBS_MONITOR_OFF) | 296 | if (!priv->monitormode) |
297 | return strlen(buf); | 297 | return strlen(buf); |
298 | priv->monitormode = LBS_MONITOR_OFF; | 298 | priv->monitormode = 0; |
299 | lbs_remove_rtap(priv); | 299 | lbs_remove_rtap(priv); |
300 | 300 | ||
301 | if (priv->currenttxskb) { | 301 | if (priv->currenttxskb) { |
@@ -392,7 +392,7 @@ static int lbs_dev_open(struct net_device *dev) | |||
392 | 392 | ||
393 | spin_lock_irq(&priv->driver_lock); | 393 | spin_lock_irq(&priv->driver_lock); |
394 | 394 | ||
395 | if (priv->monitormode != LBS_MONITOR_OFF) { | 395 | if (priv->monitormode) { |
396 | ret = -EBUSY; | 396 | ret = -EBUSY; |
397 | goto out; | 397 | goto out; |
398 | } | 398 | } |