From: Julia Lawall <julia@diku.dk>
Date: Tue, 5 May 2009 13:47:06 +0000 (+0200)
Subject: Staging: wlan-ng: p80211wext.c: problem with IW_ENCODE_ALG_WEP
X-Git-Tag: v2.6.31-rc1~105^2~188
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1611a52c395e6036725104af3a74a0cef8ea42b8;p=karo-tx-linux.git

Staging: wlan-ng: p80211wext.c: problem with IW_ENCODE_ALG_WEP

The expression !(ext->alg & IW_ENCODE_ALG_WEP) appears to be incorrect,
because there are several possible values for ext->alg that give 1 when
bit-anded with IW_ENCODE_ALG_WEP.  Therefore Richard Kennedy suggested to
rewrite the code with !=

Added \n at the end of the debug string as well.

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 3a96fce7c22e..e73123b26df7 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -1487,8 +1487,8 @@ static int p80211wext_set_encodeext(struct net_device *dev,
 	}
 
 	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-		if (!(ext->alg & IW_ENCODE_ALG_WEP)) {
-			pr_debug("asked to set a non wep key :(");
+		if (ext->alg != IW_ENCODE_ALG_WEP) {
+			pr_debug("asked to set a non wep key :(\n");
 			return -EINVAL;
 		}
 		if (idx) {