BSS coloring: BSS Color Change Announcement element generation

This information element is similar to the CSA one. It contains a
counter and the target color. Once the counter expired, the change to
the new color happens.

Just note the current implementation is based on CCA counter attributes
that only take Beacon and Probe Response framesinto account.
(Re)Association Response frames do not currently have kernel APIs to
decrement the CCA counter since mediatek mcu firmware does not support
it yet and it will be added in future firmware release.

Tested-by: Peter Chiu <chui-hao.chiu@mediatek.com>
Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 24ad61c4660a60cd343d188fdc0dab77a3482598..3ff03f845200f0df2e3f3887a55e0f060cefdf8a 100644 (file)
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -618,8 +618,17 @@ static u8 * hostapd_gen_probe_resp(struct hostapd_data *hapd,
 
 #ifdef CONFIG_IEEE80211AX
        if (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax) {
+               u8 *cca_pos;
+
                pos = hostapd_eid_he_capab(hapd, pos, IEEE80211_MODE_AP);
                pos = hostapd_eid_he_operation(hapd, pos);
+
+               /* BSS Color Change Announcement element */
+               cca_pos = hostapd_eid_cca(hapd, pos);
+               if (cca_pos != pos)
+                       hapd->cca_c_off_proberesp = cca_pos - (u8 *) resp - 2;
+               pos = cca_pos;
+
                pos = hostapd_eid_spatial_reuse(hapd, pos);
                pos = hostapd_eid_he_mu_edca_parameter_set(hapd, pos);
                pos = hostapd_eid_he_6ghz_band_cap(hapd, pos);
@@ -1658,9 +1667,18 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd,
 
 #ifdef CONFIG_IEEE80211AX
        if (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax) {
+               u8 *cca_pos;
+
                tailpos = hostapd_eid_he_capab(hapd, tailpos,
                                               IEEE80211_MODE_AP);
                tailpos = hostapd_eid_he_operation(hapd, tailpos);
+
+               /* BSS Color Change Announcement element */
+               cca_pos = hostapd_eid_cca(hapd, tailpos);
+               if (cca_pos != tailpos)
+                       hapd->cca_c_off_beacon = cca_pos - tail - 2;
+               tailpos = cca_pos;
+
                tailpos = hostapd_eid_spatial_reuse(hapd, tailpos);
                tailpos = hostapd_eid_he_mu_edca_parameter_set(hapd, tailpos);
                tailpos = hostapd_eid_he_6ghz_band_cap(hapd, tailpos);

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index fa5f043187a7086c4aa14892ab94a5ebdcc68a15..e25b6804c89506f89e968fa2b7a802a6628bc537 100644 (file)
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -5152,6 +5152,7 @@ static u16 send_assoc_resp(struct hostapd_data *hapd, struct sta_info *sta,
        if (hapd->iconf->ieee80211ax && !hapd->conf->disable_11ax) {
                p = hostapd_eid_he_capab(hapd, p, IEEE80211_MODE_AP);
                p = hostapd_eid_he_operation(hapd, p);
+               p = hostapd_eid_cca(hapd, p);
                p = hostapd_eid_spatial_reuse(hapd, p);
                p = hostapd_eid_he_mu_edca_parameter_set(hapd, p);
                p = hostapd_eid_he_6ghz_band_cap(hapd, p);

diff --git a/src/ap/ieee802_11.h b/src/ap/ieee802_11.h
index ccc8d8f5d79516e696ebd8429c99435555f8c400..ec0fc4396a7d2adc59e223ea00b68e93b5d47dee 100644 (file)
--- a/src/ap/ieee802_11.h
+++ b/src/ap/ieee802_11.h
@@ -100,6 +100,7 @@ u16 copy_sta_he_6ghz_capab(struct hostapd_data *hapd, struct sta_info *sta,
                           const u8 *he_6ghz_capab);
 int hostapd_get_he_twt_responder(struct hostapd_data *hapd,
                                 enum ieee80211_op_mode mode);
+u8 * hostapd_eid_cca(struct hostapd_data *hapd, u8 *eid);
 void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
                       const u8 *buf, size_t len, int ack);
 void hostapd_eapol_tx_status(struct hostapd_data *hapd, const u8 *dst,

diff --git a/src/ap/ieee802_11_he.c b/src/ap/ieee802_11_he.c
index 282eb466f2576ac86554a6aa7abf0c47f70675b7..f2473dc17e22bfee45a7c932aca3e36f1a56bb77 100644 (file)
--- a/src/ap/ieee802_11_he.c
+++ b/src/ap/ieee802_11_he.c
@@ -538,3 +538,19 @@ int hostapd_get_he_twt_responder(struct hostapd_data *hapd,
        return !!(mac_cap[HE_MAC_CAPAB_0] & HE_MACCAP_TWT_RESPONDER) &&
                hapd->iface->conf->he_op.he_twt_responder;
 }
+
+
+u8 * hostapd_eid_cca(struct hostapd_data *hapd, u8 *eid)
+{
+       if (!hapd->cca_in_progress)
+               return eid;
+
+       /* BSS Color Change Announcement element */
+       *eid++ = WLAN_EID_EXTENSION;
+       *eid++ = 3;
+       *eid++ = WLAN_EID_EXT_COLOR_CHANGE_ANNOUNCEMENT;
+       *eid++ = hapd->cca_count; /* Color Switch Countdown */
+       *eid++ = hapd->cca_color; /* New BSS Color Information */
+
+       return eid;
+}

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 1d4f21ba008c1ba8b6a4d6ae7350266830251ac0..d7cef69ad9161f262bd04430e18f1442b6cc00ad 100644 (file)
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -479,6 +479,7 @@
 #define WLAN_EID_EXT_HE_OPERATION 36
 #define WLAN_EID_EXT_HE_MU_EDCA_PARAMS 38
 #define WLAN_EID_EXT_SPATIAL_REUSE 39
+#define WLAN_EID_EXT_COLOR_CHANGE_ANNOUNCEMENT 42
 #define WLAN_EID_EXT_OCV_OCI 54
 #define WLAN_EID_EXT_SHORT_SSID_LIST 58
 #define WLAN_EID_EXT_HE_6GHZ_BAND_CAP 59