summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-12-31 13:28:32 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 16:42:39 -0800
commit274350fe401474d0c30cd10bbad74b5dbf34f4fe (patch)
treeb2f42c6e0596a535f25a8d01489b0d6e71baf1f2
parentf3557cc180b73308048867b591111df6436987ff (diff)
downloadblackbird-obmc-linux-274350fe401474d0c30cd10bbad74b5dbf34f4fe.tar.gz
blackbird-obmc-linux-274350fe401474d0c30cd10bbad74b5dbf34f4fe.zip
Staging: otus: 80211core: Fix &&/|| confusion
This always evaluates to true. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/otus/80211core/cmmsta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/otus/80211core/cmmsta.c b/drivers/staging/otus/80211core/cmmsta.c
index a11d559167b1..5c0dea7a3433 100644
--- a/drivers/staging/otus/80211core/cmmsta.c
+++ b/drivers/staging/otus/80211core/cmmsta.c
@@ -2808,7 +2808,7 @@ void zfStaProcessProbeReq(zdev_t* dev, zbuf_t* buf, u16_t* src)
zmw_get_wlan_dev(dev);
/* check mode : AP/IBSS */
- if ((wd->wlanMode != ZM_MODE_AP) || (wd->wlanMode != ZM_MODE_IBSS))
+ if ((wd->wlanMode != ZM_MODE_AP) && (wd->wlanMode != ZM_MODE_IBSS))
{
zm_msg0_mm(ZM_LV_3, "Ignore probe req");
return;
OpenPOWER on IntegriCloud