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 E9D244F85C7; Tue, 13 Oct 2026 12:27:52 +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=1791894474; cv=none; b=dXjyH2+mJH+1bJ9N/nkQmJoy9Ea6OYqQp9YKF4LvA+/7i2YVmuHmIXo8JoW50uztMojLOp7SOR7YexfKFQdYSQxwQ2+GIubRpzVDfV93GkAjJhD3GXrOcKRGriU+Uwcs6/iKCoqHEjp4Jujl/cJxp2TgOgGPyu1urgAzgF4aSbs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791894474; c=relaxed/simple; bh=gHINkOPIV0X16vJsZMya7amXP3SmTG8YcGv7jiVCvW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PetKmm0Qr8cp74N1RV5lDgkkmdSNrhABo/ELloq0rskORllNTu23aKHBXrFQSoNww4sJeQKik7nWi5HTWIfi2vkxfo+Qp3tpk97bkZtjNHGPy8GyrFpAFsjd8e0ZKIxLTAvTpgZrNXIvXmC6novTcZf1dkmqFTfCVK0ITeruDX4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rCRRjny5; 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="rCRRjny5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B3841F000FF; Tue, 13 Oct 2026 12:27:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791894472; bh=CJWkuBEt9xOWTLOUOHjd3BfjSx6Ta20k415hbrISb2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rCRRjny5L1LaOVFYGlWTbJ0qGgtm1I9gmVgTrzvkYjm7Vn01TpAVEu0nXz6mLcJGw UHPJ4K4cRsHDnTrh1HRgQ73KkqlsQiEbb/zKuKipeM9tC+QNhewV3iC5vjLOgjSTWT /Z0bARMykZ7xKo+8KP4AdOOwxa3n9S979F7hjej8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Devin Wittmayer , Felix Fietkau , Sasha Levin Subject: [PATCH 6.18 570/621] wifi: mt76: mt7925: dont put the band auto marker in TGID Date: Tue, 13 Oct 2026 13:39:25 +0200 Message-ID: <20261013112934.332667747@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112920.855194808@linuxfoundation.org> References: <20261013112920.855194808@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Devin Wittmayer [ Upstream commit 5796b2bf9ff718342773ac760d86eb126c112a4f ] band_idx starts out as 0xff, which tells the firmware to pick the band on its own. A remain-on-channel grant normally writes a real index over it before anything else looks. Two cases never see that: an MLD station throws the grant away, and an AP has no association to trigger one. The TX descriptor reads the same field into a two-bit slot, so the marker comes out as 3. Every data frame from those two goes out tagged band 3. Beacons are fine, they reach the firmware separately and never build a descriptor. Same numbers on an MT7925 and on a Netgear A9000: stock patched station, one link 0x00000001 0x00000001 station, two links 0x00003001 0x00000001 AP 0x00003013 0x00000013 real band index, STA 0x00001001 0x00001001 real band index, AP 0x00001013 0x00001013 Only the marker cases move. Fixes: 0cb349d742d1 ("wifi: mt76: mt7925: update mt7925_mac_link_bss_add for MLO") Signed-off-by: Devin Wittmayer Link: https://patch.msgid.link/20260911024428.65244-1-lucid_duck@justthetip.ca Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c index a8572fdba634a..ce81ac1c2c635 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c @@ -780,7 +780,8 @@ mt7925_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, val = FIELD_PREP(MT_TXD1_WLAN_IDX, wcid->idx) | FIELD_PREP(MT_TXD1_OWN_MAC, omac_idx); - if (band_idx) + /* 0xff means BAND_AUTO to the firmware, and TGID cannot encode it */ + if (band_idx && band_idx != 0xff) val |= FIELD_PREP(MT_TXD1_TGID, band_idx); txwi[1] = cpu_to_le32(val); -- 2.53.0