| From 84d68e0b64f56564560fc96b6e3ce10078462a01 Mon Sep 17 00:00:00 2001 |
| From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com> |
| Date: Wed, 8 Mar 2023 06:32:42 +0800 |
| Subject: [PATCH] mac80211: mtk: ageout color bitmap |
| |
| Adding a periodic work which runs once per second to check BSS color. |
| OBSS BSS Color will be ageout if not seen for 10 seconds. |
| --- |
| include/net/mac80211.h | 1 + |
| net/mac80211/cfg.c | 29 +++++++++++++++++++++++++++++ |
| net/mac80211/ieee80211_i.h | 5 +++++ |
| net/mac80211/iface.c | 7 +++++++ |
| net/mac80211/rx.c | 1 + |
| 5 files changed, 43 insertions(+) |
| |
| diff --git a/include/net/mac80211.h b/include/net/mac80211.h |
| index c6cadf7..6f8c661 100644 |
| --- a/include/net/mac80211.h |
| +++ b/include/net/mac80211.h |
| @@ -700,6 +700,7 @@ struct ieee80211_bss_conf { |
| struct ieee80211_he_obss_pd he_obss_pd; |
| struct cfg80211_he_bss_color he_bss_color; |
| u64 used_color_bitmap; |
| + u64 color_last_seen[64]; |
| struct ieee80211_fils_discovery fils_discovery; |
| u32 unsol_bcast_probe_resp_interval; |
| bool s1g; |
| diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c |
| index 86d231b..7449777 100644 |
| --- a/net/mac80211/cfg.c |
| +++ b/net/mac80211/cfg.c |
| @@ -4425,6 +4425,35 @@ unlock: |
| sdata_unlock(sdata); |
| } |
| |
| +void ieee80211_color_aging_work(struct work_struct *work) |
| +{ |
| + struct ieee80211_sub_if_data *sdata = |
| + container_of(work, struct ieee80211_sub_if_data, |
| + color_aging_work.work); |
| + struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf; |
| + int i = 0; |
| + |
| + sdata_lock(sdata); |
| + |
| + if (!ieee80211_sdata_running(sdata)) |
| + goto unlock; |
| + |
| + for (i = 0; i < IEEE80211_BSS_COLOR_MAX; i++) { |
| + /* ageout if not seen for a period */ |
| + if ((bss_conf->used_color_bitmap & BIT_ULL(i)) && |
| + time_before(bss_conf->color_last_seen[i], |
| + jiffies - IEEE80211_BSS_COLOR_AGEOUT_TIME * HZ)) { |
| + bss_conf->used_color_bitmap &= ~BIT_ULL(i); |
| + } |
| + } |
| + |
| + ieee80211_queue_delayed_work(&sdata->local->hw, |
| + &sdata->color_aging_work, HZ); |
| + |
| +unlock: |
| + sdata_unlock(sdata); |
| +} |
| + |
| void ieee80211_color_change_finish(struct ieee80211_vif *vif) |
| { |
| struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); |
| diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h |
| index 6edabd8..2519c14 100644 |
| --- a/net/mac80211/ieee80211_i.h |
| +++ b/net/mac80211/ieee80211_i.h |
| @@ -1033,6 +1033,8 @@ struct ieee80211_sub_if_data { |
| } debugfs; |
| #endif |
| |
| + struct delayed_work color_aging_work; |
| + |
| /* must be last, dynamically sized area in this! */ |
| struct ieee80211_vif vif; |
| }; |
| @@ -1811,8 +1813,11 @@ void ieee80211_csa_finalize_work(struct work_struct *work); |
| int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, |
| struct cfg80211_csa_settings *params); |
| |
| +#define IEEE80211_BSS_COLOR_AGEOUT_TIME 10 |
| +#define IEEE80211_BSS_COLOR_MAX 64 |
| /* color change handling */ |
| void ieee80211_color_change_finalize_work(struct work_struct *work); |
| +void ieee80211_color_aging_work(struct work_struct *work); |
| |
| /* interface handling */ |
| #define MAC80211_SUPPORTED_FEATURES_TX (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ |
| diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c |
| index d314f39..00b0443 100644 |
| --- a/net/mac80211/iface.c |
| +++ b/net/mac80211/iface.c |
| @@ -466,6 +466,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do |
| cancel_work_sync(&sdata->color_change_finalize_work); |
| |
| cancel_delayed_work_sync(&sdata->dfs_cac_timer_work); |
| + cancel_delayed_work_sync(&sdata->color_aging_work); |
| |
| if (sdata->wdev.cac_started) { |
| chandef = sdata->vif.bss_conf.chandef; |
| @@ -1391,6 +1392,10 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) |
| set_bit(SDATA_STATE_RUNNING, &sdata->state); |
| |
| switch (sdata->vif.type) { |
| + case NL80211_IFTYPE_AP: |
| + ieee80211_queue_delayed_work(&sdata->local->hw, |
| + &sdata->color_aging_work, HZ); |
| + break; |
| case NL80211_IFTYPE_P2P_DEVICE: |
| rcu_assign_pointer(local->p2p_sdata, sdata); |
| break; |
| @@ -2166,6 +2171,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, |
| ieee80211_dfs_cac_timer_work); |
| INIT_DELAYED_WORK(&sdata->dec_tailroom_needed_wk, |
| ieee80211_delayed_tailroom_dec); |
| + INIT_DELAYED_WORK(&sdata->color_aging_work, |
| + ieee80211_color_aging_work); |
| |
| for (i = 0; i < NUM_NL80211_BANDS; i++) { |
| struct ieee80211_supported_band *sband; |
| diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c |
| index 36fcf97..838085f 100644 |
| --- a/net/mac80211/rx.c |
| +++ b/net/mac80211/rx.c |
| @@ -3221,6 +3221,7 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx) |
| IEEE80211_HE_OPERATION_BSS_COLOR_MASK); |
| |
| bss_conf->used_color_bitmap |= BIT_ULL(color); |
| + bss_conf->color_last_seen[color] = jiffies; |
| |
| trace_bss_color_bitmap(color, bss_conf->used_color_bitmap); |
| |
| -- |
| 2.39.0 |
| |