OSDN Git Service

tun: vxlan: Use netif_rx().
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Sun, 6 Mar 2022 21:57:46 +0000 (22:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Mar 2022 11:40:40 +0000 (11:40 +0000)
Since commit
   baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")

the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.

Use netif_rx().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c
drivers/net/vxlan/vxlan_core.c

index bab92e4..2b9a226 100644 (file)
@@ -1984,7 +1984,7 @@ drop:
        } else if (!IS_ENABLED(CONFIG_4KSTACKS)) {
                tun_rx_batched(tun, tfile, skb, more);
        } else {
-               netif_rx_ni(skb);
+               netif_rx(skb);
        }
        rcu_read_unlock();
 
index 4ab09dd..b3cbd37 100644 (file)
@@ -1877,7 +1877,7 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
                reply->ip_summed = CHECKSUM_UNNECESSARY;
                reply->pkt_type = PACKET_HOST;
 
-               if (netif_rx_ni(reply) == NET_RX_DROP) {
+               if (netif_rx(reply) == NET_RX_DROP) {
                        dev->stats.rx_dropped++;
                        vxlan_vnifilter_count(vxlan, vni, NULL,
                                              VXLAN_VNI_STATS_RX_DROPS, 0);
@@ -2036,7 +2036,7 @@ static int neigh_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni)
                if (reply == NULL)
                        goto out;
 
-               if (netif_rx_ni(reply) == NET_RX_DROP) {
+               if (netif_rx(reply) == NET_RX_DROP) {
                        dev->stats.rx_dropped++;
                        vxlan_vnifilter_count(vxlan, vni, NULL,
                                              VXLAN_VNI_STATS_RX_DROPS, 0);