summaryrefslogtreecommitdiff
path: root/drivers/net/can/dev/dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2022-03-06 11:05:31 +0000
committerDavid S. Miller <davem@davemloft.net>2022-03-06 11:05:31 +0000
commit83b7b77af37a89a1ef82201ac8fb45456ecc25bb (patch)
treec939dc764ea1befe326e43a2832b34e7655e9e1f /drivers/net/can/dev/dev.c
parent4c22aac3f83ea3c4c90fa964a88e197f16b8cae0 (diff)
parentf9834dbdd322f144f7b51f2fe8017fc6b870b3ec (diff)
downloadlinux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.tar.gz
linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.tar.bz2
linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.zip
Merge branch 'netif_rx-conversions-part2'
Sebastian Andrzej Siewior says: ==================== net: Convert user to netif_rx(), part 2. This is the second batch of converting netif_rx_ni() caller to netif_rx(). The change making this possible is net-next and netif_rx_ni() is a wrapper around netif_rx(). This is a clean up in order to remove netif_rx_ni(). The brcmfmac changes are slilghtly larger because the inirq parameter can be removed. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/dev/dev.c')
-rw-r--r--drivers/net/can/dev/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c
index c192f25f9695..e7ab45f1c43b 100644
--- a/drivers/net/can/dev/dev.c
+++ b/drivers/net/can/dev/dev.c
@@ -154,7 +154,7 @@ static void can_restart(struct net_device *dev)
cf->can_id |= CAN_ERR_RESTARTED;
- netif_rx_ni(skb);
+ netif_rx(skb);
restart:
netdev_dbg(dev, "restarted\n");