From 12a14a5fbda66a1716f06eff3c795ce537700671 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Thu, 31 Dec 2009 13:28:32 +0100
Subject: [PATCH] --- yaml --- r: 186619 b: refs/heads/master c:
 274350fe401474d0c30cd10bbad74b5dbf34f4fe h: refs/heads/master i:   186617:
 4a85f00cc11d455108f57df26f1220aa989e7806   186615:
 7c13eac5079701caaa0e9733f7764b83da788df1 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/otus/80211core/cmmsta.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9752281d669e..3f826b8d7e91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3557cc180b73308048867b591111df6436987ff
+refs/heads/master: 274350fe401474d0c30cd10bbad74b5dbf34f4fe
diff --git a/trunk/drivers/staging/otus/80211core/cmmsta.c b/trunk/drivers/staging/otus/80211core/cmmsta.c
index a11d559167b1..5c0dea7a3433 100644
--- a/trunk/drivers/staging/otus/80211core/cmmsta.c
+++ b/trunk/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;