udp_tunnel: hard-wire NDOs to udp_tunnel_nic_*_port() helpers

All drivers use udp_tunnel_nic_*_port() helpers, prepare for
NDO removal by invoking those helpers directly.

The helpers are safe to call on all devices, they check if
device has the UDP tunnel state initialized.

Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/core/dev.c b/net/core/dev.c
index 8fa739259041aaa03585b5a7b8ebce862f4b7d1d..7afbb642e203ad1556e96e2fc7595b6289152201 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10002,7 +10002,7 @@ int register_netdevice(struct net_device *dev)
        dev->hw_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_SOFT_FEATURES_OFF);
        dev->features |= NETIF_F_SOFT_FEATURES;
 
-       if (dev->netdev_ops->ndo_udp_tunnel_add) {
+       if (dev->udp_tunnel_nic_info) {
                dev->features |= NETIF_F_RX_UDP_TUNNEL_PORT;
                dev->hw_features |= NETIF_F_RX_UDP_TUNNEL_PORT;
        }

diff --git a/net/ipv4/udp_tunnel_core.c b/net/ipv4/udp_tunnel_core.c
index 3eecba0874aa2eb918e325b83d79bd65a00134b7..376a085be7ed869473b162e0fb1e3581f46c41b9 100644 (file)
--- a/net/ipv4/udp_tunnel_core.c
+++ b/net/ipv4/udp_tunnel_core.c
@@ -90,15 +90,14 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct socket *sock,
        struct sock *sk = sock->sk;
        struct udp_tunnel_info ti;
 
-       if (!dev->netdev_ops->ndo_udp_tunnel_add ||
-           !(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
+       if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
                return;
 
        ti.type = type;
        ti.sa_family = sk->sk_family;
        ti.port = inet_sk(sk)->inet_sport;
 
-       dev->netdev_ops->ndo_udp_tunnel_add(dev, &ti);
+       udp_tunnel_nic_add_port(dev, &ti);
 }
 EXPORT_SYMBOL_GPL(udp_tunnel_push_rx_port);
 
@@ -108,15 +107,14 @@ void udp_tunnel_drop_rx_port(struct net_device *dev, struct socket *sock,
        struct sock *sk = sock->sk;
        struct udp_tunnel_info ti;
 
-       if (!dev->netdev_ops->ndo_udp_tunnel_del ||
-           !(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
+       if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
                return;
 
        ti.type = type;
        ti.sa_family = sk->sk_family;
        ti.port = inet_sk(sk)->inet_sport;
 
-       dev->netdev_ops->ndo_udp_tunnel_del(dev, &ti);
+       udp_tunnel_nic_del_port(dev, &ti);
 }
 EXPORT_SYMBOL_GPL(udp_tunnel_drop_rx_port);
 
@@ -134,11 +132,9 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)
 
        rcu_read_lock();
        for_each_netdev_rcu(net, dev) {
-               if (!dev->netdev_ops->ndo_udp_tunnel_add)
-                       continue;
                if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
                        continue;
-               dev->netdev_ops->ndo_udp_tunnel_add(dev, &ti);
+               udp_tunnel_nic_add_port(dev, &ti);
        }
        rcu_read_unlock();
 }
@@ -158,11 +154,9 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)
 
        rcu_read_lock();
        for_each_netdev_rcu(net, dev) {
-               if (!dev->netdev_ops->ndo_udp_tunnel_del)
-                       continue;
                if (!(dev->features & NETIF_F_RX_UDP_TUNNEL_PORT))
                        continue;
-               dev->netdev_ops->ndo_udp_tunnel_del(dev, &ti);
+               udp_tunnel_nic_del_port(dev, &ti);
        }
        rcu_read_unlock();
 }