Skip to contentSkip to conversation

Staging: logical/bit and confusion

PATCH Applied Roel Kluin 2 participants 2 messages Jan 17, 2009 – Jan 21, 2009 Staging

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 Staging: logical/bit and confusion

fix logical/bit and confusion

---
Is this what was intended?

// vi drivers/staging/otus/80211core/struct.h +598 #define ExtHtCap_ExtChannelOffsetAbove 0x01

// vi drivers/staging/otus/80211core/struct.h +600
#define ExtHtCap_RecomTxWidthSet 0x04

// vi drivers/staging/otus/80211core/struct.h +525
#define HTCAP_SupChannelWidthSet 0x0002

drivers/staging/otus/80211core/cwm.c +3 -3
index 80f1141..1bd0b1f 100644
@@ -75,9 +75,9 @@ void zfCoreCwmBusy(zdev_t* dev, u16_t busy)
 
     if((wd->wlanMode == ZM_MODE_INFRASTRUCTURE || wd->wlanMode == ZM_MODE_PSEUDO ||
         wd->wlanMode == ZM_MODE_IBSS)) {
-        if (wd->sta.ie.HtCap.HtCapInfo && HTCAP_SupChannelWidthSet != 0 &&
-            wd->sta.ie.HtInfo.ChannelInfo && ExtHtCap_RecomTxWidthSet != 0 &&
-            (wd->sta.ie.HtInfo.ChannelInfo && ExtHtCap_ExtChannelOffsetAbove) == 1) {
+        if ((wd->sta.ie.HtCap.HtCapInfo & HTCAP_SupChannelWidthSet) &&
+            (wd->sta.ie.HtInfo.ChannelInfo & ExtHtCap_RecomTxWidthSet) &&
+            (wd->sta.ie.HtInfo.ChannelInfo & ExtHtCap_ExtChannelOffsetAbove)) {
 
             wd->cwm.cw_width = CWM_WIDTH40;
         }
#1 lore raw

patch staging-otus-logical-bit-and-confusion.patch added to gregkh-2.6 tree

This is a note to let you know that I've just added the patch titled

Subject: Staging: otus: logical/bit and confusion

to my gregkh-2.6 tree. Its filename is

staging-otus-logical-bit-and-confusion.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Wed Jan 21 09:43:08 2009

From: Roel Kluin <[email protected]>
Date: Sat, 17 Jan 2009 14:45:29 +0100
Subject: Staging: otus: logical/bit and confusion
To: [email protected], Greg KH <[email protected]>
Cc: lkml <[email protected]>
Message-ID: <[email protected]>

fix logical/bit and confusion

---
 drivers/staging/otus/80211core/cwm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/otus/80211core/cwm.c +3 -3
@@ -75,9 +75,9 @@ void zfCoreCwmBusy(zdev_t* dev, u16_t bu
 
     if((wd->wlanMode == ZM_MODE_INFRASTRUCTURE || wd->wlanMode == ZM_MODE_PSEUDO ||
         wd->wlanMode == ZM_MODE_IBSS)) {
-        if (wd->sta.ie.HtCap.HtCapInfo && HTCAP_SupChannelWidthSet != 0 &&
-            wd->sta.ie.HtInfo.ChannelInfo && ExtHtCap_RecomTxWidthSet != 0 &&
-            (wd->sta.ie.HtInfo.ChannelInfo && ExtHtCap_ExtChannelOffsetAbove) == 1) {
+        if ((wd->sta.ie.HtCap.HtCapInfo & HTCAP_SupChannelWidthSet) &&
+            (wd->sta.ie.HtInfo.ChannelInfo & ExtHtCap_RecomTxWidthSet) &&
+            (wd->sta.ie.HtInfo.ChannelInfo & ExtHtCap_ExtChannelOffsetAbove)) {
 
             wd->cwm.cw_width = CWM_WIDTH40;
         }

Patches currently in gregkh-2.6 which might be from [email protected] are

staging/staging-meilhaus-unsigned-won-t-get-negative-after-subtraction.patch staging/staging-otus-logical-bit-and-confusion.patch