diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:07:37 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:07:37 -0400 |
| commit | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b (patch) | |
| tree | f53513819d11445385346cf75be05054dae3438d /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 34202e28fe7fc8551313f9a035a8857db83de757 (diff) | |
| parent | c9015b24b262bc7ea56cfd5d78983a73fb5ebd7d (diff) | |
| download | linux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.tar.gz linux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.tar.bz2 linux-3.10-42fb0b0278e6b9a44bee8adec051de5f43e10b2b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index b83ca358eb1..a5f7bce9632 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -801,6 +801,18 @@ static 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); |