summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuna Sinada <muna.sinada@oss.qualcomm.com>2025-03-26 00:31:25 +0300
committerJohannes Berg <johannes.berg@intel.com>2025-04-23 17:59:02 +0300
commit1a4a6a22552ca9d723f28a1fe35eab1b9b3d8b33 (patch)
treeb13f9965891ec8b490d1c6032f0c9beee1cafb6d
parent90233b0ad215efc9ea56a7c0b09021bcd4eea4ac (diff)
downloadlinux-1a4a6a22552ca9d723f28a1fe35eab1b9b3d8b33.tar.xz
wifi: mac80211: VLAN traffic in multicast path
Currently for MLO, sending out multicast frames on each link is handled by mac80211 only when IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX flag is not set. Dynamic VLAN multicast traffic utilizes software encryption. Due to this, mac80211 should handle transmitting multicast frames on all links for multicast VLAN traffic. Signed-off-by: Muna Sinada <muna.sinada@oss.qualcomm.com> Link: https://patch.msgid.link/20250325213125.1509362-4-muna.sinada@oss.qualcomm.com [remove unnecessary parentheses] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/tx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d2e4cc117903..3b9392a6ddb2 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -4508,8 +4508,10 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
IEEE80211_TX_CTRL_MLO_LINK_UNSPEC,
NULL);
} else if (ieee80211_vif_is_mld(&sdata->vif) &&
- sdata->vif.type == NL80211_IFTYPE_AP &&
- !ieee80211_hw_check(&sdata->local->hw, MLO_MCAST_MULTI_LINK_TX)) {
+ ((sdata->vif.type == NL80211_IFTYPE_AP &&
+ !ieee80211_hw_check(&sdata->local->hw, MLO_MCAST_MULTI_LINK_TX)) ||
+ (sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
+ !sdata->wdev.use_4addr))) {
ieee80211_mlo_multicast_tx(dev, skb);
} else {
normal: