diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2012-03-12 13:49:13 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-03-13 14:54:16 -0400 |
| commit | 617bbde878604adfcd557fc2a8952f77ab4ebd95 (patch) | |
| tree | aa98cf7d59427f9d0fb06f33b26e1d096bcb8e6f /net/mac80211/rx.c | |
| parent | b43: Load firmware from a work queue and not from the probe routine (diff) | |
| download | linux-dev-617bbde878604adfcd557fc2a8952f77ab4ebd95.tar.xz linux-dev-617bbde878604adfcd557fc2a8952f77ab4ebd95.zip | |
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.c | 7 |
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) switch (rx->key->conf.cipher) { case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: - /* Check for weak IVs if possible */ - if (rx->sta && ieee80211_is_data(fc) && - (!(status->flag & RX_FLAG_IV_STRIPPED) || - !(status->flag & RX_FLAG_DECRYPTED)) && - ieee80211_wep_is_weak_iv(rx->skb, rx->key)) - rx->sta->wep_weak_iv_count++; - result = ieee80211_crypto_wep_decrypt(rx); break; case WLAN_CIPHER_SUITE_TKIP: |