tun: vxlan: Use netif_rx().

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>

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index bab92e489fba978dfa8272ecf8d5d2c4c29d11e0..2b9a22669a12681185c631e772c59994ba47b574 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -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();
 

diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c
index 4ab09dd5a32a3d815168a208d1e53397391dca99..b3cbd37c4b939985c9dc24de859847e81f4f1e43 100644 (file)
--- a/drivers/net/vxlan/vxlan_core.c
+++ b/drivers/net/vxlan/vxlan_core.c
@@ -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);