From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Date: Tue, 14 Jun 2022 10:41:30 +0000 (+0300)
Subject: wifi: mac80211_hwsim: Support link channel matching on rx
X-Git-Tag: v6.0-rc1~141^2~64^2~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=912fa56b27631ba4d9b6c59a9f6d7c53ae2795b2;p=thirdparty%2Fkernel%2Flinux.git

wifi: mac80211_hwsim: Support link channel matching on rx

Accept frames from all the links' channels.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 31c8a77932dc5..4f22f3df161c2 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1474,15 +1474,25 @@ static void mac80211_hwsim_tx_iter(void *_data, u8 *addr,
 				   struct ieee80211_vif *vif)
 {
 	struct tx_iter_data *data = _data;
+	int i;
 
-	if (!vif->bss_conf.chanctx_conf)
-		return;
+	for (i = 0; i < ARRAY_SIZE(vif->link_conf); i++) {
+		struct ieee80211_bss_conf *conf = vif->link_conf[i];
+		struct ieee80211_chanctx_conf *chanctx;
 
-	if (!hwsim_chans_compat(data->channel,
-				rcu_dereference(vif->bss_conf.chanctx_conf)->def.chan))
-		return;
+		if (!conf)
+			continue;
+
+		chanctx = rcu_dereference(conf->chanctx_conf);
+		if (!chanctx)
+			continue;
+
+		if (!hwsim_chans_compat(data->channel, chanctx->def.chan))
+			continue;
 
-	data->receive = true;
+		data->receive = true;
+		return;
+	}
 }
 
 static void mac80211_hwsim_add_vendor_rtap(struct sk_buff *skb)