1 files changed, 3 insertions, 2 deletions

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index c72d1bcdcf49..1356af660b5b 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -65,6 +65,7 @@ static int __init batadv_init(void)
         batadv_recv_handler_init();
 
         batadv_iv_init();
+        batadv_nc_init();
 
         batadv_event_workqueue = create_singlethread_workqueue("bat_events");
 
@@ -142,7 +143,7 @@ int batadv_mesh_init(struct net_device *soft_iface)
         if (ret < 0)
                 goto err;
 
-        ret = batadv_nc_init(bat_priv);
+        ret = batadv_nc_mesh_init(bat_priv);
         if (ret < 0)
                 goto err;
 
@@ -167,7 +168,7 @@ void batadv_mesh_free(struct net_device *soft_iface)
         batadv_vis_quit(bat_priv);
 
         batadv_gw_node_purge(bat_priv);
-        batadv_nc_free(bat_priv);
+        batadv_nc_mesh_free(bat_priv);
         batadv_dat_free(bat_priv);
         batadv_bla_free(bat_priv);