From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 01/11] mac80211: move managed mode station state modification
Date: Fri, 20 Jan 2012 13:55:17 +0100 [thread overview]
Message-ID: <20120120125740.332467077@sipsolutions.net> (raw)
In-Reply-To: 20120120125516.000124996@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
Move the station state modification right before insert,
this just makes the current code more readable (you can
tell that it's before insertion looking at a single
screenful of code) right now, but some upcoming changes
will require this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/mlme.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
--- a/net/mac80211/mlme.c 2012-01-20 13:54:17.000000000 +0100
+++ b/net/mac80211/mlme.c 2012-01-20 13:54:18.000000000 +0100
@@ -1587,20 +1587,6 @@ static bool ieee80211_assoc_success(stru
return false;
}
- err = sta_info_move_state(sta, IEEE80211_STA_AUTH);
- if (!err)
- 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) {
- printk(KERN_DEBUG
- "%s: failed to move station %pM to desired state\n",
- sdata->name, sta->sta.addr);
- WARN_ON(__sta_info_destroy(sta));
- mutex_unlock(&sdata->local->sta_mtx);
- return false;
- }
-
rates = 0;
basic_rates = 0;
sband = local->hw.wiphy->bands[wk->chan->band];
@@ -1648,6 +1634,20 @@ static bool ieee80211_assoc_success(stru
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);
+ if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
+ err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+ if (err) {
+ printk(KERN_DEBUG
+ "%s: failed to move station %pM to desired state\n",
+ sdata->name, sta->sta.addr);
+ WARN_ON(__sta_info_destroy(sta));
+ mutex_unlock(&sdata->local->sta_mtx);
+ return false;
+ }
+
/* sta_info_reinsert will also unlock the mutex lock */
err = sta_info_reinsert(sta);
sta = NULL;
next prev parent reply other threads:[~2012-01-20 12:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:55 [PATCH 00/11] station management & auth/assoc redesign Johannes Berg
2012-01-20 12:55 ` Johannes Berg [this message]
2012-01-20 12:55 ` [PATCH 02/11] mac80211: simplify AP_VLAN handling Johannes Berg
2012-01-20 12:55 ` [PATCH 03/11] mac80211: dont program keys for stations not uploaded Johannes Berg
2012-01-20 12:55 ` [PATCH 04/11] mac80211: add NOTEXIST station state Johannes Berg
2012-01-20 12:55 ` [PATCH 06/11] mac80211: implement sta_add/sta_remove in sta_state Johannes Berg
2012-01-20 12:55 ` [PATCH 07/11] mac80211: call rate control only after init Johannes Berg
2012-01-20 12:55 ` [PATCH 08/11] mac80211: remove dummy STA support Johannes Berg
2012-01-20 12:55 ` [PATCH 09/11] cfg80211: stop tracking authenticated state Johannes Berg
2012-01-20 12:55 ` [PATCH 10/11] cfg80211: export cfg80211_ref_bss Johannes Berg
2012-01-20 12:55 ` [PATCH 11/11] mac80211: redesign auth/assoc Johannes Berg
2012-01-20 13:01 ` [PATCH 05/11 (resend for list)] mac80211: add sta_state callback Johannes Berg
2012-02-02 7:45 ` [PATCH 00/11] station management & auth/assoc redesign Eliad Peller
2012-02-02 15:13 ` Johannes Berg
2012-02-02 20:52 ` John W. Linville
2012-02-02 23:21 ` Johannes Berg
2012-02-03 6:26 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120120125740.332467077@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).