Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb4431bf authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: remove unused ASSOC_AP flag 



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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 11127e91

net/mac80211/debugfs_sta.c

+2 −2
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf, 
	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),

net/mac80211/mlme.c

+0 −1
Original line number Diff line number Diff line
@@ -1574,7 +1574,6 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk, 


	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);

net/mac80211/sta_info.h

+0 −2
Original line number Diff line number Diff line
@@ -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,