wifi: mac80211: do not check BSS color collision in certain cases
Subsystems (2)
PATCH 1/1 wifi: mac80211: do not check BSS color collision in certain cases
Do not check BSS color collision in following cases
1. already under a color change
2. color change is disabled
Signed-off-by Michael-CY Lee <[email protected]>
--- net/mac80211/rx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/mac80211/rx.c +4 -2
@@ -3358,6 +3358,7 @@ static void ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx) {struct ieee80211_mgmt *mgmt = (void *)rx->skb->data; +struct ieee80211_bss_conf *bss_conf;const struct element *ie;size_t baselen;
@@ -3368,7 +3369,9 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx)if (ieee80211_hw_check (&rx->local->hw,DETECTS_COLOR_COLLISION ))return ; -if (rx->link->conf->csa_active) + bss_conf = rx->link->conf; +if (bss_conf->csa_active || bss_conf->color_change_active || + !bss_conf->he_bss_color.enabled)return ; baselen = mgmt->u.beacon.variable - rx->skb->data;
@@ -3380,7 +3383,6 @@ ieee80211_rx_check_bss_color_collision(struct ieee80211_rx_data *rx) rx->skb->len - baselen);if (ie && ie->datalen >=sizeof (struct ieee80211_he_operation ) && ie->datalen >=ieee80211_he_oper_size (ie->data +1 )) { -struct ieee80211_bss_conf *bss_conf = rx->link->conf;const struct ieee80211_he_operation *he_oper;u8 color;
Signature · 1 line
2.25.1