diff --git a/[refs] b/[refs]
index 8bd905bf226e..da41fa0c2147 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf00f379d82d170712150588accd2ebe316c2226
+refs/heads/master: b6a27d1e6b8e163dee054c9cd03639c62756c2e2
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 794b735264e6..55308b88faac 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -517,6 +517,17 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 		return -EOPNOTSUPP;
 	}
 
+	switch (key->cipher) {
+	case WLAN_CIPHER_SUITE_TKIP:
+		key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
+		/* fall through */
+	case WLAN_CIPHER_SUITE_CCMP:
+		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
+		break;
+	default:
+		break;
+	}
+
 	/*
 	 * We could program these keys into the hardware as well, but we
 	 * don't expect much multicast traffic in IBSS and having keys