diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:20:49 +0100 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-11-05 14:20:49 +0100 |
| commit | 29a6cc6e3a241e34749edc3cc69cf88757acd491 (patch) | |
| tree | 6a0efb8175f50c183e0541cbb1b1f8c2d3979493 /net/mac80211 | |
| parent | 3374c3584e1cb313f62b6a13418e477625c4a25e (diff) | |
| parent | 5390967b2f98e6aa46f20eae09580e7db73826b9 (diff) | |
Merge remote-tracking branch 'remotes/upstream-stable/linux-3.4.y' into tilt-3.4
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/wpa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 0ae23c60968c..ea6d03bd5d5f 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -106,7 +106,8 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx) if (status->flag & RX_FLAG_MMIC_ERROR) goto mic_fail; - if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key) + if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key && + rx->key->conf.cipher == WLAN_CIPHER_SUITE_TKIP) goto update_iv; return RX_CONTINUE; |