mac80211: propagate the support for TWT to the driver

TWT is a feature that was added in 11ah and enhanced in
11ax. There are two bits that need to be set if we want
to use the feature in 11ax: one in the HE Capability IE
and one in the Extended Capability IE. This is because
of backward compatibility between 11ah and 11ax.

In order to simplify the flow for the low level driver
in managed mode, aggregate the two bits and add a boolean
that tells whether TWT is supported or not, but only if
11ax is supported.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index aecbdf38b4c2247c6be3aea9fea5d5861ea0adcc..88219cc137c38b885c45595259ae015a1134ed24 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -496,6 +496,8 @@ struct ieee80211_ftm_responder_params {
  * @uora_ocw_range: UORA element's OCW Range field
  * @frame_time_rts_th: HE duration RTS threshold, in units of 32us
  * @he_support: does this BSS support HE
+ * @twt_requester: does this BSS support TWT requester (relevant for managed
+ *     mode only, set if the AP advertises TWT responder role)
  * @assoc: association status
  * @ibss_joined: indicates whether this station is part of an IBSS
  *     or not
@@ -594,6 +596,7 @@ struct ieee80211_bss_conf {
        u8 uora_ocw_range;
        u16 frame_time_rts_th;
        bool he_support;
+       bool twt_requester;
        /* association related data */
        bool assoc, ibss_joined;
        bool ibss_creator;

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d2bc8d57c87eb40b943873732e5705514fcd2fc2..3d1334a4a264d90f5ee8172ddfe06b6abb67d721 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3058,6 +3058,19 @@ static void ieee80211_get_rates(struct ieee80211_supported_band *sband,
        }
 }
 
+static bool ieee80211_twt_req_supported(const struct sta_info *sta,
+                                       const struct ieee802_11_elems *elems)
+{
+       if (elems->ext_capab_len < 10)
+               return false;
+
+       if (!(elems->ext_capab[9] & WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT))
+               return false;
+
+       return sta->sta.he_cap.he_cap_elem.mac_cap_info[0] &
+               IEEE80211_HE_MAC_CAP0_TWT_RES;
+}
+
 static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                                    struct cfg80211_bss *cbss,
                                    struct ieee80211_mgmt *mgmt, size_t len)
@@ -3247,8 +3260,11 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
                                                  sta);
 
                bss_conf->he_support = sta->sta.he_cap.has_he;
+               bss_conf->twt_requester =
+                       ieee80211_twt_req_supported(sta, &elems);
        } else {
                bss_conf->he_support = false;
+               bss_conf->twt_requester = false;
        }
 
        if (bss_conf->he_support) {