Commit 68885a54 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg

mac80211: set auth flags after other station info

For TDLS, the AUTHORIZED flag arrives with all other important station
info (supported rates, HT/VHT caps, ...). Make sure to set the station
state in the low-level driver after transferring this information to
the mac80211 STA entry.
This aligns the STA information during sta_state callbacks with the
non-TDLS case.
Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 9deba04d
...@@ -997,9 +997,12 @@ static int sta_apply_parameters(struct ieee80211_local *local, ...@@ -997,9 +997,12 @@ static int sta_apply_parameters(struct ieee80211_local *local,
} }
} }
/* auth flags will be set later for TDLS stations */
if (!test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {
ret = sta_apply_auth_flags(local, sta, mask, set); ret = sta_apply_auth_flags(local, sta, mask, set);
if (ret) if (ret)
return ret; return ret;
}
if (mask & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) { if (mask & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) {
if (set & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) if (set & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE))
...@@ -1136,6 +1139,13 @@ static int sta_apply_parameters(struct ieee80211_local *local, ...@@ -1136,6 +1139,13 @@ static int sta_apply_parameters(struct ieee80211_local *local,
#endif #endif
} }
/* set the STA state after all sta info from usermode has been set */
if (test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {
ret = sta_apply_auth_flags(local, sta, mask, set);
if (ret)
return ret;
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment