X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fmac80211%2Fwpa.c;h=91bf32af55e9aab807ee350d4db06da2c9bdb161;hb=a073d7e3ad687a7ef32b65affe80faa7ce89bf92;hp=ee72779729e5350858514811b9daa86ecd75aa81;hpb=9772152b4b3cd32a1aadf75e3d1a16a072d3e4a5;p=linux-2.6-microblaze.git

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index ee72779729e5..91bf32af55e9 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -946,7 +946,8 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx)
 
 	info = IEEE80211_SKB_CB(skb);
 
-	if (info->control.hw_key)
+	if (info->control.hw_key &&
+	    !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
 		return TX_CONTINUE;
 
 	if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
@@ -962,6 +963,9 @@ ieee80211_crypto_aes_cmac_encrypt(struct ieee80211_tx_data *tx)
 
 	bip_ipn_set64(mmie->sequence_number, pn64);
 
+	if (info->control.hw_key)
+		return TX_CONTINUE;
+
 	bip_aad(skb, aad);
 
 	/*