aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-13 08:17:59 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-13 14:40:58 -0500
commit543d1b92d5500841e70f15e79d197bbffed36561 (patch)
treea41f7f9dced47e2f9fd967531107f57a7a59d1fd
parentdfd00c4c8f3dfa1fd7cec45f83d98b2a49743dcd (diff)
mac80211: fix no-op authorized transitions
When userspace attempts to authorize a station that is already authorized, nothing happens as you'd expect. Similarly, when it unauthorizes a station that is associated, nothing happens. However, when it unauthorizes a station that isn't even associated yet, we erroneously try to move the station to associated. This seems to happen occasionally as a result of a race when wpa_supplicant attempts to unauthorize the port in managed mode. Particularly with my new patches to keep stations, it can then move a station into ASSOCIATED state before we have really associated, which is really confusing. I introduced this bug in "mac80211: refactor station state transitions" Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e60df48fa4d4..296620d6ca0c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -791,7 +791,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
791 if (set & BIT(NL80211_STA_FLAG_AUTHORIZED)) 791 if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
792 ret = sta_info_move_state_checked(sta, 792 ret = sta_info_move_state_checked(sta,
793 IEEE80211_STA_AUTHORIZED); 793 IEEE80211_STA_AUTHORIZED);
794 else 794 else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
795 ret = sta_info_move_state_checked(sta, 795 ret = sta_info_move_state_checked(sta,
796 IEEE80211_STA_ASSOC); 796 IEEE80211_STA_ASSOC);
797 if (ret) 797 if (ret)