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 1A4F94EF148; Tue, 13 Oct 2026 12:48:40 +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=1791895721; cv=none; b=iCunAd7hBuF7K09PPlPM8UIKxy8/YqLmJzGEf4UvxPFXnRYZS1hdJXB43cR8DsNPSlb5OO7UmyoT82Hhy1hp34YyeywUZrTxO/0tr+jAwXzLaqPFRIGE/pTU7yUhQV/QuhNA5yz3iSnHTZS1+CS3FWdrI7adZPbr+UgL/aKPr1k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791895721; c=relaxed/simple; bh=y5CQp8orTr26uiAIeZiyHBts95OgrJAa5nC6UBiao1I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rRYp9HuXKc2ks48TvSsprSiDpEVkxDWiQgtQpTh60PZiGbSM25cMarlpRJWf4iNI3oGnz9SR5f1uu52dpu1zIxZA4Jc/LDheqbLnzpS5tIEOCrCJqUOp4B8YBNQCqxGJxNz9DrRbtk7E5h+24kD8mip4a7kYZ+N2QM0LW8oAyAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NXygL+ks; 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="NXygL+ks" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6968C1F000FF; Tue, 13 Oct 2026 12:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791895720; bh=pEXRYrvL1BokSVHZ2ii5ze0dl+Ck+F4EaUFfL0q9bA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NXygL+ksf7rrUyZOXquso038w9v7a/oFW9zGHRcaVYgn9zPj5mEMC+xVXXd86mGyc jot+S7y5ZVw88ZOn3BJNDwi0yOWcmzqbNZa7WDAs4Jba9/ijgRx+/YWkIJOSO9DiB2 PlHS7nkmmng6/xLkdQw3mzlkNezEVzqWlPe9Rd0I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrea Pesaresi , Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 6.12 326/497] wifi: mac80211: set info->band for 802.3 encap offload frames Date: Tue, 13 Oct 2026 13:38:13 +0200 Message-ID: <20261013112915.641473301@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112907.864180619@linuxfoundation.org> References: <20261013112907.864180619@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau [ Upstream commit 4febc02cd02f021f2b6d0768332be643ef14a12d ] Unlike the 802.11 TX paths, ieee80211_8023_xmit() does not set info->band from the channel context on non-MLD interfaces. It stays at 0, so ieee80211_get_tx_rates() uses the wrong band for these frames. Set it the same way as ieee80211_build_hdr(): drop the frame if there is no channel context, and leave the band at 0 on MLD interfaces. Reported-by: Andrea Pesaresi Fixes: 50ff477a8639 ("mac80211: add 802.11 encapsulation offloading support") Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau Link: https://patch.msgid.link/20260926120216.4054712-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8ea17ac862451..0fad278d8f249 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4657,6 +4657,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, { struct ieee80211_tx_info *info; struct ieee80211_local *local = sdata->local; + struct ieee80211_chanctx_conf *chanctx_conf; struct tid_ampdu_tx *tid_tx = NULL; struct sk_buff *seg, *next; unsigned int skbs = 0, len = 0; @@ -4706,6 +4707,16 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, sdata = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); + /* MLD transmissions must not rely on the band */ + if (!ieee80211_vif_is_mld(&sdata->vif)) { + chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); + if (unlikely(!chanctx_conf)) { + kfree_skb_list(skb); + return; + } + info->band = chanctx_conf->def.chan->band; + } + info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; info->control.vif = &sdata->vif; -- 2.53.0