diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-03-06 11:05:31 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-06 11:05:31 +0000 |
| commit | 83b7b77af37a89a1ef82201ac8fb45456ecc25bb (patch) | |
| tree | c939dc764ea1befe326e43a2832b34e7655e9e1f /net | |
| parent | Merge branch 'tuntap-kfree_skb_reason' (diff) | |
| parent | wireless: Use netif_rx(). (diff) | |
| download | wireguard-linux-83b7b77af37a89a1ef82201ac8fb45456ecc25bb.tar.xz wireguard-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 'net')
| -rw-r--r-- | net/can/af_can.c | 2 | ||||
| -rw-r--r-- | net/wireless/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index cce2af10eb3e..1fb49d51b25d 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -284,7 +284,7 @@ int can_send(struct sk_buff *skb, int loop) } if (newskb) - netif_rx_ni(newskb); + netif_rx(newskb); /* update statistics */ pkg_stats->tx_frames++; diff --git a/net/wireless/util.c b/net/wireless/util.c index e02f1702806e..63b37f421e10 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -2153,7 +2153,7 @@ void cfg80211_send_layer2_update(struct net_device *dev, const u8 *addr) skb->dev = dev; skb->protocol = eth_type_trans(skb, dev); memset(skb->cb, 0, sizeof(skb->cb)); - netif_rx_ni(skb); + netif_rx(skb); } EXPORT_SYMBOL(cfg80211_send_layer2_update); |