---

yaml
---
r: 194249
b: refs/heads/master
c: a90178f
h: refs/heads/master
i:
  194247: 6801ba4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a61261d7f571f760611711cd4e6b64ef661ad1
+refs/heads/master: a90178fa1dce52816ae9fa4a3ba031886b79c5ae

trunk/drivers/net/wireless/iwlwifi/iwl-agn.c

@@ -2901,12 +2901,13 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 	mutex_lock(&priv->mutex);
 	iwl_scan_cancel_timeout(priv, 100);
 
-	/* If we are getting WEP group key and we didn't receive any key mapping
+	/*
+	 * If we are getting WEP group key and we didn't receive any key mapping
 	 * so far, we are in legacy wep mode (group key only), otherwise we are
 	 * in 1X mode.
-	 * In legacy wep mode, we use another host command to the uCode */
-	if (key->alg == ALG_WEP && sta_id == priv->hw_params.bcast_sta_id &&
-		priv->iw_mode != NL80211_IFTYPE_AP) {
+	 * In legacy wep mode, we use another host command to the uCode.
+	 */
+	if (key->alg == ALG_WEP && !sta && vif->type != NL80211_IFTYPE_AP) {
 		if (cmd == SET_KEY)
 			is_default_wep_key = !priv->key_mapping_key;
 		else