aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2009-08-20 21:00:34 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-08-28 14:40:25 -0400
commit40ba60ddfeff8ef42fb33c0bdacfbb5f83e96b32 (patch)
tree2b3ca427609dc0445f670c4bb900a28993511711 /drivers
parent84f6a01ce05fa671f7745b6e041e698a2d1f1341 (diff)
rndis_wlan: fix broken logic in add_wep_key()
add_wep_key() tries to check if key length is not 5 AND not 13 but uses (key_len != 5 || key_len != 13) instead. Fix this. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/rndis_wlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index d42692dfbc6..c5b921bf5a9 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1214,7 +1214,7 @@ static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
struct ndis_80211_wep_key ndis_key;
int cipher, ret;
- if ((key_len != 5 || key_len != 13) || index < 0 || index > 3)
+ if ((key_len != 5 && key_len != 13) || index < 0 || index > 3)
return -EINVAL;
if (key_len == 5)