projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2x00mac.c
diff --git
a/drivers/net/wireless/rt2x00/rt2x00mac.c
b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 2b724fc4e306e6645cbad1aeb4badddbcf8e896f..c03748dafd49fe200c9862cbde0b4e99bb454cf0 100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00mac.c
@@
-489,6
+489,8
@@
int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
crypto.cipher = rt2x00crypto_key_to_cipher(key);
if (crypto.cipher == CIPHER_NONE)
return -EOPNOTSUPP;
+ if (crypto.cipher == CIPHER_TKIP && rt2x00_is_usb(rt2x00dev))
+ return -EOPNOTSUPP;
crypto.cmd = cmd;