diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
| commit | 974f4b86951972b133b4ec5b36956b979dea08d0 (patch) | |
| tree | 090b441b1c96f708e8a033c7f88fa383dd1e7cba /net/mac80211/wpa.c | |
| parent | 40a54e2e116950a27dbd0a46a7b1ff8e982de477 (diff) | |
| parent | 3499d6424f682a58761d827012567c552b053842 (diff) | |
Merge commit 'v3.2.2' into rt-3.2.2-rt10
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index f614ce7bb6e3..28a39bb8d4a9 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -106,7 +106,7 @@ 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)) + if (!(status->flag & RX_FLAG_IV_STRIPPED) && rx->key) goto update_iv; return RX_CONTINUE; |