[PATCH] mac80211: remove unused ASSOC_AP flag
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2011-11-17 15:23:34
From: Johannes Berg <redacted> WLAN_STA_ASSOC_AP indicates that the station entry is for an AP we're associated to but isn't used so remove it. Signed-off-by: Johannes Berg <redacted> --- net/mac80211/debugfs_sta.c | 4 ++-- net/mac80211/mlme.c | 1 - net/mac80211/sta_info.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-)
--- a/net/mac80211/mlme.c 2011-11-14 16:46:03.000000000 +0100
+++ b/net/mac80211/mlme.c 2011-11-17 14:46:01.000000000 +0100@@ -1575,7 +1575,6 @@ static bool ieee80211_assoc_success(stru set_sta_flag(sta, WLAN_STA_AUTH); set_sta_flag(sta, WLAN_STA_ASSOC); - set_sta_flag(sta, WLAN_STA_ASSOC_AP); if (!(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) set_sta_flag(sta, WLAN_STA_AUTHORIZED); --- a/net/mac80211/sta_info.h 2011-11-10 09:27:32.000000000 +0100 +++ b/net/mac80211/sta_info.h 2011-11-17 14:46:04.000000000 +0100
@@ -30,7 +30,6 @@ * when virtual port control is not in use. * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble * frames. - * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP. * @WLAN_STA_WME: Station is a QoS-STA. * @WLAN_STA_WDS: Station is one of our WDS peers. * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
@@ -60,7 +59,6 @@ enum ieee80211_sta_info_flags { WLAN_STA_PS_STA, WLAN_STA_AUTHORIZED, WLAN_STA_SHORT_PREAMBLE, - WLAN_STA_ASSOC_AP, WLAN_STA_WME, WLAN_STA_WDS, WLAN_STA_CLEAR_PS_FILT, --- a/net/mac80211/debugfs_sta.c 2011-11-08 18:04:34.000000000 +0100 +++ b/net/mac80211/debugfs_sta.c 2011-11-17 14:46:20.000000000 +0100
@@ -63,10 +63,10 @@ static ssize_t sta_flags_read(struct fil test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : "" int res = scnprintf(buf, sizeof(buf), - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", TEST(AUTH), TEST(ASSOC), TEST(PS_STA), TEST(PS_DRIVER), TEST(AUTHORIZED), - TEST(SHORT_PREAMBLE), TEST(ASSOC_AP), + TEST(SHORT_PREAMBLE), TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT), TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL), TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),