diff --git a/[refs] b/[refs]
index 4be25a2c2348..2dd65e87fe73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6267ea655f141bfd0955910b728571fb2a4ed1df
+refs/heads/master: 09686b560ff229bc6c87489717dce118c7d2b20b
diff --git a/trunk/drivers/staging/batman-adv/main.c b/trunk/drivers/staging/batman-adv/main.c
index 498861fb55ee..b3e23e11fbe9 100644
--- a/trunk/drivers/staging/batman-adv/main.c
+++ b/trunk/drivers/staging/batman-adv/main.c
@@ -71,6 +71,8 @@ static void __exit batman_exit(void)
 	flush_workqueue(bat_event_workqueue);
 	destroy_workqueue(bat_event_workqueue);
 	bat_event_workqueue = NULL;
+
+	synchronize_net();
 }
 
 int mesh_init(struct net_device *soft_iface)
@@ -132,9 +134,6 @@ void mesh_free(struct net_device *soft_iface)
 	hna_local_free(bat_priv);
 	hna_global_free(bat_priv);
 
-	synchronize_net();
-
-	synchronize_rcu();
 	atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
 }