From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81AC3C61D99 for ; Wed, 22 Nov 2023 15:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344691AbjKVPjq (ORCPT ); Wed, 22 Nov 2023 10:39:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344685AbjKVPj0 (ORCPT ); Wed, 22 Nov 2023 10:39:26 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AA44478A; Wed, 22 Nov 2023 07:37:05 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB460C116B0; Wed, 22 Nov 2023 15:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700667424; bh=8R4ieF89QwLamS+6SQ0FPiopWLe1sv6oGljgg/xL5Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TIL2eT65JKzi5yZWDQnwqNeeKZn+YxR7lQch9eDM6T5a3ONO7vPQTE5vz5w0Wbjfn 9XfP0q/LhYjejGt7fu24srdIPXKlX/EMgRVY4XGGcBMdY0R3Pjzhwoh2KKxHeBZUG9 m3a1JjFJjegF8HIN8TTmf7PsEpjPpajdG4M1tLfMozs2U2cD22KaKCba57Z7pmL1G/ q0+vj7+X7srISlUDFpoEZkgamyeinLbFa6YbXQ1eIRLHAg89gm5glWBCVfO9f8UqqQ kQpOi4ik8it4qGMFuA7m+BJlLcWtCC+7zyNO7FAGy0zysQ2OLIWhpbPQ888XnJyTH1 h3WtVEPj7vx0g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Pakhunov , Vincent Wong , Pavan Chebbi , Jakub Kicinski , Sasha Levin , mchan@broadcom.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 2/3] tg3: Increment tx_dropped in tg3_tso_bug() Date: Wed, 22 Nov 2023 10:36:54 -0500 Message-ID: <20231122153658.853640-2-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231122153658.853640-1-sashal@kernel.org> References: <20231122153658.853640-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.330 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Pakhunov [ Upstream commit 17dd5efe5f36a96bd78012594fabe21efb01186b ] tg3_tso_bug() drops a packet if it cannot be segmented for any reason. The number of discarded frames should be incremented accordingly. Signed-off-by: Alex Pakhunov Signed-off-by: Vincent Wong Reviewed-by: Pavan Chebbi Link: https://lore.kernel.org/r/20231113182350.37472-2-alexey.pakhunov@spacex.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/tg3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 96c7a452a4a97..dc27c81ad5129 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7872,8 +7872,10 @@ static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi, segs = skb_gso_segment(skb, tp->dev->features & ~(NETIF_F_TSO | NETIF_F_TSO6)); - if (IS_ERR(segs) || !segs) + if (IS_ERR(segs) || !segs) { + tnapi->tx_dropped++; goto tg3_tso_bug_end; + } do { nskb = segs; -- 2.42.0