From a850e21533e6573d5e32b470f0f713e74629e422 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 7 Feb 2013 17:19:08 +0100 Subject: [PATCH] --- yaml --- r: 352661 b: refs/heads/master c: 3e4d40fa118e58ce51e85015587a944ec5c69400 h: refs/heads/master i: 352659: d47c1ca6917168f2adc7a0e9781f77be0485b28e v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 593394047a0b..26d4dfe26849 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd0f979a1b67f0889aea24a7c7d2a54d6706a1cf +refs/heads/master: 3e4d40fa118e58ce51e85015587a944ec5c69400 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 3bcf39365be8..76cacdb062c8 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -2212,9 +2212,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, if (elems.wmm_param) set_sta_flag(sta, WLAN_STA_WME); - err = sta_info_move_state(sta, IEEE80211_STA_AUTH); - if (!err) - err = sta_info_move_state(sta, IEEE80211_STA_ASSOC); + err = sta_info_move_state(sta, IEEE80211_STA_ASSOC); if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED); if (err) {