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 4EFDE4D1781; Thu, 17 Sep 2026 18:53: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=1789671233; cv=none; b=ohS2IuSW5sxEegHJXKcYsXu8LtyrFmPcizqiGCczwyY72qphEHhxNCqoc2lfX6fC2UHhZog3oVm9NG0BxslFuWeL1OUNOvljc/6KNH0BoSbvu/a91BSmwBPfuuEWmdw/iucnTo1Xf4/1Djkt4UGZPVcQOhJNlUQu5fiqKuFvn68= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789671233; c=relaxed/simple; bh=Jm6TZQfPq0xCIXqMaIzP33yiz3r/+sUfusdXMAQ53wI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k2q9mWUpj8HgZrf1DdS6Gjc+KiNQlrvPiQpiGu82zW66mcH2hEQRAUv0LRJSUWQkRuNUyvzY6sAdnml7nbotAq0zRecnONN5/2yLyfv9plVuuOdvmGn7ppdR4Xd+c4mlhnEJH2mctZWy2dyvevIwImNSI1qw9sUQAEd/XqHbz+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1rjDUxtw; 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="1rjDUxtw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99E7D1F000FF; Thu, 17 Sep 2026 18:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789671232; bh=bh6G+k1dWyATfLXcnHCOLsgxit3duNX+q1+4KFZbqGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1rjDUxtwDElvw8/XbnzqzFxvRddUvzeK2xKdvVdwtbFYFhXEFXRzcwR7LuN+ju51O Sx27VxXshmcL1fvQUn800cljj29spq2jpyPiNwX6UykFZ0HDZD4k7jerHWrj+JUGu2 n5igJLMjJDT9aAQfjCkOok6Po02oWa4OyboFKz9c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Joe Damato , Paolo Abeni Subject: [PATCH 6.12 0882/1102] bnxt_en: Only restore LRO if the device supports TPA Date: Thu, 17 Sep 2026 16:13:45 +0100 Message-ID: <20260917151602.711571076@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@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: Joe Damato commit 4e17b5007b6664559cdad2b2fe270526cf786b5b upstream. With a P5+ device with firmware that reports max_aggs_supported == 0, it is possible to make LRO settable by attaching and detaching an XDP program even though the device does not support TPA. Fix this by testing BNXT_SUPPORTS_TPA before restoring the feature bit. Fixes: f0aa6a37a3db ("eth: bnxt: always recalculate features after XDP clearing, fix null-deref") Reported-by: Sashiko Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260828190900.1767611-1-joe%40dama.to Cc: stable@vger.kernel.org Signed-off-by: Joe Damato Link: https://patch.msgid.link/20260902015652.2421609-2-joe@dama.to Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4670,7 +4670,8 @@ void bnxt_set_rx_skb_mode(struct bnxt *b bnxt_get_max_rings(bp, &rx, &tx, true); if (rx > 1) { bp->flags &= ~BNXT_FLAG_NO_AGG_RINGS; - bp->dev->hw_features |= NETIF_F_LRO; + if (BNXT_SUPPORTS_TPA(bp)) + bp->dev->hw_features |= NETIF_F_LRO; } }