From: Roel Kluin <roel.kluin@gmail.com>
Date: Thu, 31 Dec 2009 12:28:32 +0000 (+0100)
Subject: Staging: otus: 80211core: Fix &&/|| confusion
X-Git-Tag: v2.6.34-rc1~10^2~1^2~231
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=274350fe401474d0c30cd10bbad74b5dbf34f4fe;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/staging/otus/80211core/cmmsta.c b/drivers/staging/otus/80211core/cmmsta.c
index a11d559167b..5c0dea7a343 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;