|
|
@@ -2527,7 +2527,7 @@ static struct device_type vxlan_type = {
|
|
|
* supply the listening VXLAN udp ports. Callers are expected
|
|
|
* to implement the ndo_add_vxlan_port.
|
|
|
*/
|
|
|
-void vxlan_get_rx_port(struct net_device *dev)
|
|
|
+static void vxlan_push_rx_ports(struct net_device *dev)
|
|
|
{
|
|
|
struct vxlan_sock *vs;
|
|
|
struct net *net = dev_net(dev);
|
|
|
@@ -2536,6 +2536,9 @@ void vxlan_get_rx_port(struct net_device *dev)
|
|
|
__be16 port;
|
|
|
unsigned int i;
|
|
|
|
|
|
+ if (!dev->netdev_ops->ndo_add_vxlan_port)
|
|
|
+ return;
|
|
|
+
|
|
|
spin_lock(&vn->sock_lock);
|
|
|
for (i = 0; i < PORT_HASH_SIZE; ++i) {
|
|
|
hlist_for_each_entry_rcu(vs, &vn->sock_list[i], hlist) {
|
|
|
@@ -2547,7 +2550,6 @@ void vxlan_get_rx_port(struct net_device *dev)
|
|
|
}
|
|
|
spin_unlock(&vn->sock_lock);
|
|
|
}
|
|
|
-EXPORT_SYMBOL_GPL(vxlan_get_rx_port);
|
|
|
|
|
|
/* Initialize the device structure. */
|
|
|
static void vxlan_setup(struct net_device *dev)
|
|
|
@@ -3283,20 +3285,22 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn,
|
|
|
unregister_netdevice_many(&list_kill);
|
|
|
}
|
|
|
|
|
|
-static int vxlan_lowerdev_event(struct notifier_block *unused,
|
|
|
- unsigned long event, void *ptr)
|
|
|
+static int vxlan_netdevice_event(struct notifier_block *unused,
|
|
|
+ unsigned long event, void *ptr)
|
|
|
{
|
|
|
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)
|
|
|
vxlan_handle_lowerdev_unregister(vn, dev);
|
|
|
+ else if (event == NETDEV_OFFLOAD_PUSH_VXLAN)
|
|
|
+ vxlan_push_rx_ports(dev);
|
|
|
|
|
|
return NOTIFY_DONE;
|
|
|
}
|
|
|
|
|
|
static struct notifier_block vxlan_notifier_block __read_mostly = {
|
|
|
- .notifier_call = vxlan_lowerdev_event,
|
|
|
+ .notifier_call = vxlan_netdevice_event,
|
|
|
};
|
|
|
|
|
|
static __net_init int vxlan_init_net(struct net *net)
|