projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84f6a01
)
rndis_wlan: fix broken logic in add_wep_key()
author
Jussi Kivilinna
<
[email protected]
>
Thu, 20 Aug 2009 18:00:34 +0000
(21:00 +0300)
committer
John W. Linville
<
[email protected]
>
Fri, 28 Aug 2009 18:40:25 +0000
(14:40 -0400)
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 <
[email protected]
>
Signed-off-by: John W. Linville <
[email protected]
>
drivers/net/wireless/rndis_wlan.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/rndis_wlan.c
b/drivers/net/wireless/rndis_wlan.c
index d42692dfbc676731384f5a731b8e1fd7e7d208f4..c5b921bf5a964caefd4ee51188ff44008fd40f83 100644
(file)
--- 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)