diff options
| author | Kristian Evensen <kristian.evensen@gmail.com> | 2021-06-15 12:01:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-15 20:29:28 +0200 |
| commit | 057d49334c02a79af81c30a8d240e641bd6f1741 (patch) | |
| tree | 851be480323e195c96f07e7d6128ddabe26e476f /drivers/net | |
| parent | net: cdc_ncm: switch to eth%d interface naming (diff) | |
| download | linux-057d49334c02a79af81c30a8d240e641bd6f1741.tar.xz linux-057d49334c02a79af81c30a8d240e641bd6f1741.zip | |
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().
Suggested-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/usb/qmi_wwan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |