---

yaml
---
r: 311615
b: refs/heads/master
c: eac9ac6
h: refs/heads/master
i:
  311613: 18bd77d
  311611: b03c698
  311607: b213aff
  311599: 2811347
  311583: caca8ee
  311551: 606cd78
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff0b804632f025b072f81fc0cd585102b0a43534
+refs/heads/master: eac9ac6d1f5d0e9d33e4ded682187b630e7606cd

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

@@ -796,6 +796,18 @@ int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
 	switch (op) {
 	case ADD:
 		ret = iwlagn_mac_sta_add(hw, vif, sta);
+		if (ret)
+			break;
+		/*
+		 * Clear the in-progress flag, the AP station entry was added
+		 * but we'll initialize LQ only when we've associated (which
+		 * would also clear the in-progress flag). This is necessary
+		 * in case we never initialize LQ because association fails.
+		 */
+		spin_lock_bh(&priv->sta_lock);
+		priv->stations[iwl_sta_id(sta)].used &=
+			~IWL_STA_UCODE_INPROGRESS;
+		spin_unlock_bh(&priv->sta_lock);
 		break;
 	case REMOVE:
 		ret = iwlagn_mac_sta_remove(hw, vif, sta);