projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
[platform/kernel/linux-starfive.git]
/
net
/
mac80211
/
wep.c
diff --git
a/net/mac80211/wep.c
b/net/mac80211/wep.c
index
efa3f48
..
73e8f34
100644
(file)
--- a/
net/mac80211/wep.c
+++ b/
net/mac80211/wep.c
@@
-293,7
+293,8
@@
ieee80211_crypto_wep_decrypt(struct ieee80211_rx_data *rx)
return RX_DROP_UNUSABLE;
ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);
/* remove ICV */
return RX_DROP_UNUSABLE;
ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key);
/* remove ICV */
- if (pskb_trim(rx->skb, rx->skb->len - IEEE80211_WEP_ICV_LEN))
+ if (!(status->flag & RX_FLAG_ICV_STRIPPED) &&
+ pskb_trim(rx->skb, rx->skb->len - IEEE80211_WEP_ICV_LEN))
return RX_DROP_UNUSABLE;
}
return RX_DROP_UNUSABLE;
}