From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F01561B0434; Mon, 17 Mar 2025 16:38:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742229512; cv=none; b=mCBh7tFPwsdSNhbP1RkU/xbrRZ7n2RwTu5l3vpJ4o+wW43nHRlFHnepjWWEhrxJJJ+FB3sgqenul8Wyyl6b3x/St1e9oQ91YeVbEcV/njUBiBRe19GXrF+ti7/tGlCpMnUOTyODhjzmuXNmB6dCARvRxYuFI5CA/oCDGnBJ7Nfk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742229512; c=relaxed/simple; bh=jIlON1tZOlVKbK7BgElBwm7rcX4qZRB9A02Qmig0UE4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GXu8eoge2Hifz7WlzZcjnprOSdxwSw6bDqAGQI3aOHoqbu8HA1Dd75MKR7a3UALHxgdDA1HUrt07KkRGm5R7ZF6Hw1N2A/smjnZknXtAbZc191uKybsefCo1Ew4YaGIePK6+cjG9tn+Ubi144w41GCruQYyrUlbC2/4/pRhH4Ew= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=asFVYs3+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="asFVYs3+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90346C4CEE3; Mon, 17 Mar 2025 16:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742229511; bh=jIlON1tZOlVKbK7BgElBwm7rcX4qZRB9A02Qmig0UE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=asFVYs3+0LNTHJ0HBswCH+TkwoDU/2NnZmo6RBjhE4ilbKRyejE3ig3uywbbgDKhg JO8N+jBfrAbYPZkbk6cWwSZRKNRcr1fTbdrd2JJPq7YVSslYU7PPlhFJz/2jw1zVty 4ohb9q30HqHMkRFWr0AaaGbM4y4uUOcotdlxyp3H3URN1lDpdgCb9O88o7Tct6viIF vEN5ABLyFGH+BJXA+vM34SBOdgLjSWW4hfA6+3+l3P+qPPSyXfkn+9MLi+OjrneIaF rTUdrCcGS8Nk6f0EN2XZm6rb2x6hDUTQTYU/v7p0PiqNGgfCgMMvyekd1eFMT8gzyo XA3zaWXxUusaA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Ilan Peer , Miri Korenblit , Sasha Levin , johannes@sipsolutions.net, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 05/13] wifi: mac80211: fix SA Query processing in MLO Date: Mon, 17 Mar 2025 12:38:10 -0400 Message-Id: <20250317163818.1893102-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317163818.1893102-1-sashal@kernel.org> References: <20250317163818.1893102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.19 Content-Transfer-Encoding: 8bit From: Johannes Berg [ Upstream commit 9a267ce4a3fca93a34a8881046f97bcf472228c8 ] 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 Reviewed-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250306123626.bab48bb49061.I9391b22f1360d20ac8c4e92604de23f27696ba8f@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/rx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 6f3a86040cfcd..8e1fbdd3bff10 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -6,7 +6,7 @@ * Copyright 2007-2010 Johannes Berg * 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 @@ -3323,8 +3323,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; } @@ -3340,9 +3340,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)); -- 2.39.5