diff --git a/[refs] b/[refs] index 133d92755d21..e79a9d9cab9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdd3ae3d1e749cf6597f035a5357f297a1af8eb3 +refs/heads/master: 1140afa862842ac3e56678693050760edc4ecde9 diff --git a/trunk/net/mac80211/wpa.c b/trunk/net/mac80211/wpa.c index 93aab0715e8a..422b79851ec5 100644 --- a/trunk/net/mac80211/wpa.c +++ b/trunk/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;