1 files changed, 9 insertions, 2 deletions

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index f11345e163d7..01acccc4d218 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -32,6 +32,7 @@
 #include <linux/rculist.h>
 #include <linux/rtnetlink.h>
 #include <linux/slab.h>
+#include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <net/net_namespace.h>
 
@@ -464,7 +465,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
         hard_iface->soft_iface = soft_iface;
         bat_priv = netdev_priv(hard_iface->soft_iface);
 
-        ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface);
+        ret = netdev_master_upper_dev_link(hard_iface->net_dev,
+                                           soft_iface, NULL, NULL);
         if (ret)
                 goto err_dev;
 
@@ -638,9 +640,12 @@ batadv_hardif_add_interface(struct net_device *net_dev)
                 goto free_sysfs;
 
         INIT_LIST_HEAD(&hard_iface->list);
+        INIT_HLIST_HEAD(&hard_iface->neigh_list);
         INIT_WORK(&hard_iface->cleanup_work,
                   batadv_hardif_remove_interface_finish);
 
+        spin_lock_init(&hard_iface->neigh_list_lock);
+
         hard_iface->num_bcasts = BATADV_NUM_BCASTS_DEFAULT;
         if (batadv_is_wifi_netdev(net_dev))
                 hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;
@@ -708,7 +713,8 @@ static int batadv_hard_if_event(struct notifier_block *this,
         }
 
         hard_iface = batadv_hardif_get_by_netdev(net_dev);
-        if (!hard_iface && event == NETDEV_REGISTER)
+        if (!hard_iface && (event == NETDEV_REGISTER ||
+                            event == NETDEV_POST_TYPE_CHANGE))
                 hard_iface = batadv_hardif_add_interface(net_dev);
 
         if (!hard_iface)
@@ -723,6 +729,7 @@ static int batadv_hard_if_event(struct notifier_block *this,
                 batadv_hardif_deactivate_interface(hard_iface);
                 break;
         case NETDEV_UNREGISTER:
+        case NETDEV_PRE_TYPE_CHANGE:
                 list_del_rcu(&hard_iface->list);
 
                 batadv_hardif_remove_interface(hard_iface);