qmi_wwan: Do not call netif_rx from rx_fixup
PATCH 1/1 qmi_wwan: Do not call netif_rx from rx_fixup
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().
--- drivers/net/usb/qmi_wwan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/qmi_wwan.c +1 -1
@@ -621,7 +621,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 ) {
Signature · 1 line
2.25.1
Hi all,
I forgot to set the correct subject prefix. I intended for this patch to target "net". Sorry about that.
Kristian
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 6 lines · On Tue, 15 Jun 2021 12:01:51 +0200 you wrote:
When the
QMI_WWAN_FLAG_PASS_THROUGHis set,netif_rx()is called fromqmi_wwan_rx_fixup(). When the call tonetif_rx()is successful (which is most of the time),usbnet_skb_return()is called (fromrx_process()).usbnet_skb_return()will then callnetif_rx()a second time for the same skb.
Quoted 6 lines
Simplify the code and avoid the redundant
netif_rx()call by changingqmi_wwan_rx_fixup()to always return 1 whenQMI_WWAN_FLAG_PASS_THROUGHis set. We then leave it up to the existing infrastructure to callnetif_rx().[...]
Here is the summary with links:
- qmi_wwan: Do not call netif_rx from rx_fixup
https://git.kernel.org/netdev/net/c/057d49334c02
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html