wifi: mac80211: fix SA Query processing in MLO

When MLO is used and SA Query processing isn't done by
userspace (e.g. wpa_supplicant w/o CONFIG_OCV), then
the mac80211 code kicks in but uses the wrong addresses.
Fix them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250306123626.bab48bb49061.I9391b22f1360d20ac8c4e92604de23f27696ba8f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 1e28efe4203c017cd2d0362e2981db2cc728f95c..0659ec892ec6c71b12356f4204b4e8dfb319759a 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -6,7 +6,7 @@
  * Copyright 2007-2010 Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  */
 
 #include <linux/jiffies.h>
@@ -3329,8 +3329,8 @@ static void ieee80211_process_sa_query_req(struct ieee80211_sub_if_data *sdata,
                return;
        }
 
-       if (!ether_addr_equal(mgmt->sa, sdata->deflink.u.mgd.bssid) ||
-           !ether_addr_equal(mgmt->bssid, sdata->deflink.u.mgd.bssid)) {
+       if (!ether_addr_equal(mgmt->sa, sdata->vif.cfg.ap_addr) ||
+           !ether_addr_equal(mgmt->bssid, sdata->vif.cfg.ap_addr)) {
                /* Not from the current AP or not associated yet. */
                return;
        }
@@ -3346,9 +3346,9 @@ static void ieee80211_process_sa_query_req(struct ieee80211_sub_if_data *sdata,
 
        skb_reserve(skb, local->hw.extra_tx_headroom);
        resp = skb_put_zero(skb, 24);
-       memcpy(resp->da, mgmt->sa, ETH_ALEN);
+       memcpy(resp->da, sdata->vif.cfg.ap_addr, ETH_ALEN);
        memcpy(resp->sa, sdata->vif.addr, ETH_ALEN);
-       memcpy(resp->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN);
+       memcpy(resp->bssid, sdata->vif.cfg.ap_addr, ETH_ALEN);
        resp->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
                                          IEEE80211_STYPE_ACTION);
        skb_put(skb, 1 + sizeof(resp->u.action.u.sa_query));