aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-12 08:49:13 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-03-13 14:54:16 -0400
commit617bbde878604adfcd557fc2a8952f77ab4ebd95 (patch)
treeaa98cf7d59427f9d0fb06f33b26e1d096bcb8e6f /net/mac80211/rx.c
parent6b6fa5868eec26bdc6a83543cebb8cf832a2645a (diff)
mac80211: move RX WEP weak IV counting
This is better done inside the WEP decrypt function where it doesn't have to check all the conditions any more since they've been tested already. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5f6e32ca0858..b38da13e2a88 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1070,13 +1070,6 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
1070 switch (rx->key->conf.cipher) { 1070 switch (rx->key->conf.cipher) {
1071 case WLAN_CIPHER_SUITE_WEP40: 1071 case WLAN_CIPHER_SUITE_WEP40:
1072 case WLAN_CIPHER_SUITE_WEP104: 1072 case WLAN_CIPHER_SUITE_WEP104:
1073 /* Check for weak IVs if possible */
1074 if (rx->sta && ieee80211_is_data(fc) &&
1075 (!(status->flag & RX_FLAG_IV_STRIPPED) ||
1076 !(status->flag & RX_FLAG_DECRYPTED)) &&
1077 ieee80211_wep_is_weak_iv(rx->skb, rx->key))
1078 rx->sta->wep_weak_iv_count++;
1079
1080 result = ieee80211_crypto_wep_decrypt(rx); 1073 result = ieee80211_crypto_wep_decrypt(rx);
1081 break; 1074 break;
1082 case WLAN_CIPHER_SUITE_TKIP: 1075 case WLAN_CIPHER_SUITE_TKIP: