2013-02-07 16:19:59

by Johannes Berg

Subject: [PATCH] mac80211: remove unused code to mark AP station authenticated

From: Johannes Berg <[email protected]>

When we get to association, the AP station already exists and
is marked authenticated, so moving it into IEEE80211_STA_AUTH
again is a NOP, remove it.

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/mlme.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9a0993c..1acb307 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2213,9 +2213,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) {
--
1.8.0

2013-02-11 11:51:52

by Johannes Berg

Subject: Re: [PATCH] mac80211: remove unused code to mark AP station authenticated

On Thu, 2013-02-07 at 17:20 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> When we get to association, the AP station already exists and
> is marked authenticated, so moving it into IEEE80211_STA_AUTH
> again is a NOP, remove it.

Applied.

johannes