summaryrefslogtreecommitdiffstats
path: root/net/mac80211/wep.c
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2016-11-21 16:58:40 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-01-12 10:15:18 +0100
commitcef0acd4d7d4811d2d19cd0195031bf0dfe41249 (patch)
treed240324b4bbfb68400c3ea1508c9a5b84746256f /net/mac80211/wep.c
parent93be2b74279c15c2844684b1a027fdc71dd5d9bf (diff)
downloadblackbird-op-linux-cef0acd4d7d4811d2d19cd0195031bf0dfe41249.tar.gz
blackbird-op-linux-cef0acd4d7d4811d2d19cd0195031bf0dfe41249.zip
mac80211: Add RX flag to indicate ICV stripped
Add a flag that indicates that the WEP ICV was stripped from an RX packet, allowing the device to not transfer that if it's already checked. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/wep.c')
-rw-r--r--net/mac80211/wep.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c
index efa3f48f1ec5..73e8f347802e 100644
--- 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 */
- 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;
}
OpenPOWER on IntegriCloud