wifi: iwlwifi: mvm: use bcast/mcast link station id

For an MLD AP, use the correct link mcast or bcast station id.

Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230329100039.0cffa6c45242.I342e17e7bca87b7f05939eb2ebd36fc2aff0b49f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 61a95ee3ef2d8945e2fd5459f799f19a9e0300f0..ca1284f11f8b363e070c19a83b007acbf5b97431 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -739,10 +739,23 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
                if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||
                    info.control.vif->type == NL80211_IFTYPE_AP ||
                    info.control.vif->type == NL80211_IFTYPE_ADHOC) {
+                       u32 link_id = u32_get_bits(info.control.flags,
+                                                  IEEE80211_TX_CTRL_MLO_LINK);
+                       struct iwl_mvm_vif_link_info *link;
+
+                       if (link_id == IEEE80211_LINK_UNSPECIFIED) {
+                               if (info.control.vif->active_links)
+                                       link_id = ffs(info.control.vif->active_links) - 1;
+                               else
+                                       link_id = 0;
+                       }
+
+                       link = mvmvif->link[link_id];
+
                        if (!ieee80211_is_data(hdr->frame_control))
-                               sta_id = mvmvif->deflink.bcast_sta.sta_id;
+                               sta_id = link->bcast_sta.sta_id;
                        else
-                               sta_id = mvmvif->deflink.mcast_sta.sta_id;
+                               sta_id = link->mcast_sta.sta_id;
 
                        queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info, hdr);
                } else if (info.control.vif->type == NL80211_IFTYPE_MONITOR) {