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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34D60C2B9F4 for ; Mon, 28 Jun 2021 14:22:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20D7C619BE for ; Mon, 28 Jun 2021 14:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233715AbhF1OYw (ORCPT ); Mon, 28 Jun 2021 10:24:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:55228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233180AbhF1OVe (ORCPT ); Mon, 28 Jun 2021 10:21:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C19D661C8F; Mon, 28 Jun 2021 14:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624889949; bh=HXZWMFTM4rc1VvbXjfrhFeBANb2/h4lWBdB8XBCt/d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbK6B8IN3u9+5Ad8Beg4jARH3j4ADRfDhqeAGa0MBTCFmQ/QtZOVnNJjEaF9vTut8 7zJbMOFA06IdXOToo4TlZ2V+V88/0wLdj5j03mrLfzqOpoKBcoVgl+wYrb+9D9RpEX 32/RP6oTfI6r7gJC8Ec/Xd+1tYX7Bu4w4/qspdFq1cSMGrkC5KPaR+zD+9Ffrfu687 CvmIwoT3Hz51EMO644CdpoiQEjR32525zfawwLRC6M6mkGzJ6ktA0fY1cW4k2DE6bc JqV0BzLiuaPqsPWL8Yz2L1nUTq1I4ARof5xQkBGWqT6og5ptQodTbw/ODbAKYoYF5Z xpCOmz06QXyhQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kristian Evensen , =?UTF-8?q?Bj=C3=B8rn=20Mork?= , "David S . Miller" , Sasha Levin Subject: [PATCH 5.12 046/110] qmi_wwan: Do not call netif_rx from rx_fixup Date: Mon, 28 Jun 2021 10:17:24 -0400 Message-Id: <20210628141828.31757-47-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628141828.31757-1-sashal@kernel.org> References: <20210628141828.31757-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.14-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.14-rc1 X-KernelTest-Deadline: 2021-06-30T14:18+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kristian Evensen [ Upstream commit 057d49334c02a79af81c30a8d240e641bd6f1741 ] When the QMI_WWAN_FLAG_PASS_THROUGH is set, netif_rx() is called from qmi_wwan_rx_fixup(). When the call to netif_rx() is successful (which is most of the time), usbnet_skb_return() is called (from rx_process()). usbnet_skb_return() will then call netif_rx() a second time for the same skb. Simplify the code and avoid the redundant netif_rx() call by changing qmi_wwan_rx_fixup() to always return 1 when QMI_WWAN_FLAG_PASS_THROUGH is set. We then leave it up to the existing infrastructure to call netif_rx(). Suggested-by: Bjørn Mork Signed-off-by: Kristian Evensen Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/qmi_wwan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 6700f1970b24..bc55ec739af9 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -575,7 +575,7 @@ static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) if (info->flags & QMI_WWAN_FLAG_PASS_THROUGH) { skb->protocol = htons(ETH_P_MAP); - return (netif_rx(skb) == NET_RX_SUCCESS); + return 1; } switch (skb->data[0] & 0xf0) { -- 2.30.2