mac80211: fix STA flags
Johannes Berg
maintainerPATCH 1/1 mac80211: fix STA flags
I just noticed that the STA flags are shared between hostapd and mac80211 so since we're starting to use them for internal flags that actually clash with other flags hostapd uses internally, we need to translate.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/debugfs_sta.c | 2 net/mac80211/hostapd_ioctl.h | 7 +++ net/mac80211/ieee80211_ioctl.c | 95 +++++++++++++++++++++++++++++++++-------- net/mac80211/sta_info.h | 48 ++++++++++++-------- 4 files changed, 116 insertions(+), 36 deletions(-)
net/mac80211/debugfs_sta.c +1 -1
@@ -90,7 +90,7 @@ static ssize_t sta_flags_read(struct fil sta->flags &WLAN_STA_ASSOC ?"ASSOC\n" :"" , sta->flags &WLAN_STA_PS ?"PS\n" :"" , sta->flags &WLAN_STA_TIM ?"TIM\n" :"" , - sta->flags &WLAN_STA_PERM ?"PERM\n" :"" , + sta->flags &WLAN_STA_ASSOC_AP ?"ASSOC_AP\n" :"" , sta->flags &WLAN_STA_AUTHORIZED ?"AUTHORIZED\n" :"" , sta->flags &WLAN_STA_SHORT_PREAMBLE ?"SHORT PREAMBLE\n" :"" , sta->flags & WLAN_STA_WME ? "WME\n" : "",
net/mac80211/sta_info.h +30 -18
54 lines not on this page · raw message
net/mac80211/hostapd_ioctl.h +7 -0
@@ -76,6 +76,13 @@ enum {#define ALIGNED __attribute__ ((aligned))#endif +/* hostapd compatible STA flags */ +#define HOSTAPD_STA_AUTH BIT(0) +#define HOSTAPD_STA_ASSOC BIT(1) +#define HOSTAPD_STA_AUTHORIZED BIT(5) +#define HOSTAPD_STA_SHORT_PREAMBLE BIT(7) +#define HOSTAPD_STA_WME BIT(9) +struct prism2_hostapd_param {u32 cmd;u8 sta_addr[ETH_ALEN ];
net/mac80211/ieee80211_ioctl.c +78 -17
130 lines not on this page · raw message