| Message ID | 20200131111300.891737-24-luca@coelho.fi (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | cfg80211/mac80211 patches from our internal tree 2020-01-31 | expand |
On Fri, 2020-01-31 at 13:13 +0200, Luca Coelho wrote: > From: Shaul Triebitz <shaul.triebitz@intel.com> > > The managed interface SMPS mode was not set in the HE 6GHz > capabilities IE. Set it. > > Signed-off-by: Ilan Peer <ilan.peer@intel.com> > Signed-off-by: Luca Coelho <luciano.coelho@intel.com> This author/s-o-b chain makes no sense... > + * @twt_protected: does this BSS support protected TWT frame and this patch is not related to SMPS mode at all, Luca, what happened here?! johannes
On Fri, 2020-02-14 at 10:06 +0100, Johannes Berg wrote: > On Fri, 2020-01-31 at 13:13 +0200, Luca Coelho wrote: > > From: Shaul Triebitz <shaul.triebitz@intel.com> > > > > The managed interface SMPS mode was not set in the HE 6GHz > > capabilities IE. Set it. > > > > Signed-off-by: Ilan Peer <ilan.peer@intel.com> > > Signed-off-by: Luca Coelho <luciano.coelho@intel.com> > > This author/s-o-b chain makes no sense... > > > + * @twt_protected: does this BSS support protected TWT frame > > and this patch is not related to SMPS mode at all, Luca, what happened > here?! Ouch, sorry about this. The wrong-commit-message bug in my script is still there, apparently... :( I'll resend this patch with the correct message in a new series. -- Luca.
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 6d4ea71523d2..a930cc710e70 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -508,6 +508,7 @@ struct ieee80211_ftm_responder_params { * mode only, set if the AP advertises TWT responder role) * @twt_responder: does this BSS support TWT requester (relevant for managed * mode only, set if the AP advertises TWT responder role) + * @twt_protected: does this BSS support protected TWT frames * @assoc: association status * @ibss_joined: indicates whether this station is part of an IBSS * or not @@ -618,6 +619,7 @@ struct ieee80211_bss_conf { bool he_support; bool twt_requester; bool twt_responder; + bool twt_protected; /* association related data */ bool assoc, ibss_joined; bool ibss_creator; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9ab0842a7c37..34fe500df687 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3389,9 +3389,17 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, bss_conf->he_support = sta->sta.he_cap.has_he; changed |= ieee80211_recalc_twt_req(sdata, sta, elems); - } else { + if (elems->rsnx && elems->rsnx_len && + (elems->rsnx[0] & WLAN_RSNX_CAPA_PROTECTED_TWT) && + wiphy_ext_feature_isset(local->hw.wiphy, + NL80211_EXT_FEATURE_PROTECTED_TWT)) + bss_conf->twt_protected = true; + else + bss_conf->twt_protected = false; +} else { bss_conf->he_support = false; bss_conf->twt_requester = false; + bss_conf->twt_protected = false; } if (bss_conf->he_support) {