From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 A1E6746AA92; Tue, 21 Jul 2026 15:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784649459; cv=none; b=S4yn0z46edLPIubborW03eMKoBRPoByEU05Ncu5VtvPIpwS3o4rcQ8PU6QlZ8OIbeAmLVNjD+uMfxMmiYCGH1n37c9yShieyGeSPsSWL9NRLqgBmq6wEl2wM9h66gIbbwei3u14ScKFM44Y8PIO1HrOCQOELFgGl2WwI1HyUMuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784649459; c=relaxed/simple; bh=GfsuYjaLRK5vpR4WW1CFNPb10xPH56O0UR9g/wXagLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ahu9QLinBZiP1l4zq4FYxO5Uw9Xtlru0TqGZ38156gRXLl2+uPvMLFMaWf+xxnhZC1DcGEtRUeAELxmG2NPKzB+jAPI8bHHuPW3o6DekbqHHZWCg2PVWQrvi75Q+nYjwVf4Bs4/FSdQ+Tora6KGOvErBfAPSKrajSGeLgnxq03w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KZT0M7Ro; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KZT0M7Ro" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A7891F000E9; Tue, 21 Jul 2026 15:57:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784649458; bh=r32OZz/+zPaH1fwaJLy1c9whsc/b3bpJpn0Ym9g33aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KZT0M7RoJm+gjZng5qm5SN8AqqPCiNX4Ghi3eYfqpzH9BxIx7VkozN/FlEEy6WB8+ Ojz17/WtJxF/ZU8j1H2DNzeE3V+kBi0FJ5gpewoVkeKI2uzc/Yox9oj6PBOJSby8Tq gHvGx6XhJqkh7YMVE7/9Tst7tqhx1k4pkC7HXGhs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 7.1 0585/2077] wifi: mt76: mt792x: skip MLD header rewrite for 802.3 encap TX Date: Tue, 21 Jul 2026 17:04:18 +0200 Message-ID: <20260721152606.610377596@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Wang [ Upstream commit a1152244702bb31b64650e5ca8308142286c0e4a ] mt792x_tx() rewrites addr1/addr2/addr3 by treating skb->data as an 802.11 header for MLD traffic. That is only valid for native 802.11 frames. Direct 802.3 TX can also reach this path with IEEE80211_TX_CTL_HW_80211_ENCAP set, where skb->data is not an 802.11 header. Skip the MLD header rewrite for HW-encap packets to avoid corrupting 802.3 frame contents. Fixes: ebb1406813c6 ("wifi: mt76: mt7925: add link handling to txwi") Signed-off-by: Sean Wang Link: https://patch.msgid.link/20260425144648.734030-1-sean.wang@kernel.org Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt792x_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c index 5a5d7534830bba..dc63400c1b996b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c +++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c @@ -105,7 +105,8 @@ void mt792x_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, wcid = &mvif->sta.deflink.wcid; } - if (vif && control->sta && ieee80211_vif_is_mld(vif)) { + if (vif && control->sta && ieee80211_vif_is_mld(vif) && + !(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_link_sta *link_sta; struct ieee80211_bss_conf *conf; -- 2.53.0