tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Jakub Kicinski dedc33e7 876c4384

+9 -20
+4 -10
drivers/net/geneve.c
··· 1851 1851 { 1852 1852 struct net_device *dev = netdev_notifier_info_to_dev(ptr); 1853 1853 1854 - if (event == NETDEV_UDP_TUNNEL_PUSH_INFO || 1855 - event == NETDEV_UDP_TUNNEL_DROP_INFO) { 1856 - geneve_offload_rx_ports(dev, event == NETDEV_UDP_TUNNEL_PUSH_INFO); 1857 - } else if (event == NETDEV_UNREGISTER) { 1858 - if (!dev->udp_tunnel_nic_info) 1859 - geneve_offload_rx_ports(dev, false); 1860 - } else if (event == NETDEV_REGISTER) { 1861 - if (!dev->udp_tunnel_nic_info) 1862 - geneve_offload_rx_ports(dev, true); 1863 - } 1854 + if (event == NETDEV_UDP_TUNNEL_PUSH_INFO) 1855 + geneve_offload_rx_ports(dev, true); 1856 + else if (event == NETDEV_UDP_TUNNEL_DROP_INFO) 1857 + geneve_offload_rx_ports(dev, false); 1864 1858 1865 1859 return NOTIFY_DONE; 1866 1860 }
+5 -10
drivers/net/vxlan.c
··· 4521 4521 struct net_device *dev = netdev_notifier_info_to_dev(ptr); 4522 4522 struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id); 4523 4523 4524 - if (event == NETDEV_UNREGISTER) { 4525 - if (!dev->udp_tunnel_nic_info) 4526 - vxlan_offload_rx_ports(dev, false); 4524 + if (event == NETDEV_UNREGISTER) 4527 4525 vxlan_handle_lowerdev_unregister(vn, dev); 4528 - } else if (event == NETDEV_REGISTER) { 4529 - if (!dev->udp_tunnel_nic_info) 4530 - vxlan_offload_rx_ports(dev, true); 4531 - } else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO || 4532 - event == NETDEV_UDP_TUNNEL_DROP_INFO) { 4533 - vxlan_offload_rx_ports(dev, event == NETDEV_UDP_TUNNEL_PUSH_INFO); 4534 - } 4526 + else if (event == NETDEV_UDP_TUNNEL_PUSH_INFO) 4527 + vxlan_offload_rx_ports(dev, true); 4528 + else if (event == NETDEV_UDP_TUNNEL_DROP_INFO) 4529 + vxlan_offload_rx_ports(dev, false); 4535 4530 4536 4531 return NOTIFY_DONE; 4537 4532 }