udp_tunnel: remove REGISTER/UNREGISTER handling from tunnel drivers

udp_tunnel_nic handles REGISTER and UNREGISTER event, now that all
drivers use that infra we can drop the event handling in the tunnel
drivers.

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/drivers/net/geneve.c b/drivers/net/geneve.c
index 5523f069b9a5a0c3d84f80d7f534db56bc59108c..6aa775d60c575cc54e61ea779a26d05361857d64 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1851,16 +1851,10 @@ static int geneve_netdevice_event(struct notifier_block *unused,
 {
        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
 
-       if (event == NETDEV_UDP_TUNNEL_PUSH_INFO ||
-           event == NETDEV_UDP_TUNNEL_DROP_INFO) {
-               geneve_offload_rx_ports(dev, event == NETDEV_UDP_TUNNEL_PUSH_INFO);
-       } else if (event == NETDEV_UNREGISTER) {
-               if (!dev->udp_tunnel_nic_info)
-                       geneve_offload_rx_ports(dev, false);
-       } else if (event == NETDEV_REGISTER) {
-               if (!dev->udp_tunnel_nic_info)
-                       geneve_offload_rx_ports(dev, true);
-       }
+       if (event == NETDEV_UDP_TUNNEL_PUSH_INFO)
+               geneve_offload_rx_ports(dev, true);
+       else if (event == NETDEV_UDP_TUNNEL_DROP_INFO)
+               geneve_offload_rx_ports(dev, false);
 
        return NOTIFY_DONE;
 }

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index a8ad710629e69f9dac4d83eee38ba065780403f3..b9364433de8f99f85e82943b126f1947ab2202f8 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -4521,17 +4521,12 @@ static int vxlan_netdevice_event(struct notifier_block *unused,
        struct net_device *dev = netdev_notifier_info_to_dev(ptr);
        struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
 
-       if (event == NETDEV_UNREGISTER) {
-               if (!dev->udp_tunnel_nic_info)
-                       vxlan_offload_rx_ports(dev, false);
+       if (event == NETDEV_UNREGISTER)
                vxlan_handle_lowerdev_unregister(vn, dev);
-       } else if (event == NETDEV_REGISTER) {
-               if (!dev->udp_tunnel_nic_info)
-                       vxlan_offload_rx_ports(dev, true);
-       } else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO ||
-                  event == NETDEV_UDP_TUNNEL_DROP_INFO) {
-               vxlan_offload_rx_ports(dev, event == NETDEV_UDP_TUNNEL_PUSH_INFO);
-       }
+       else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO)
+               vxlan_offload_rx_ports(dev, true);
+       else if (event == NETDEV_UDP_TUNNEL_DROP_INFO)
+               vxlan_offload_rx_ports(dev, false);
 
        return NOTIFY_DONE;
 }