Home » Mailing list archives » git-commits-head » 2010 » March » 8

Staging: otus: 80211core: Fix &&/|| confusion

Previous thread: Staging: cx25821: off by one in cx25821_enum_input() by Linux Kernel Mailing List on Sunday, March 7, 2010 - 6:00 pm. (1 message)

Next thread: Staging: rt2860: Use skb_tail_pointer by Linux Kernel Mailing List on Sunday, March 7, 2010 - 6:01 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: Staging: otus: 80211core: Fix &&/|| confusion
Date: Sunday, March 7, 2010 - 6:00 pm

Gitweb:     http://git.kernel.org/linus/274350fe401474d0c30cd10bbad74b5dbf34f4fe
Commit:     274350fe401474d0c30cd10bbad74b5dbf34f4fe
Parent:     f3557cc180b73308048867b591111df6436987ff
Author:     Roel Kluin <roel.kluin@gmail.com>
AuthorDate: Thu Dec 31 13:28:32 2009 +0100
Committer:  Greg Kroah-Hartman <gregkh@suse.de>
CommitDate: Wed Mar 3 16:42:39 2010 -0800

    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>
---
 drivers/staging/otus/80211core/cmmsta.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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


[ message continues ]
Previous thread: Staging: cx25821: off by one in cx25821_enum_input() by Linux Kernel Mailing List on Sunday, March 7, 2010 - 6:00 pm. (1 message)

Next thread: Staging: rt2860: Use skb_tail_pointer by Linux Kernel Mailing List on Sunday, March 7, 2010 - 6:01 pm. (1 message)