From 480c223d14376d0201fb99b551d2588a2f791686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Sun, 12 Sep 2010 23:21:52 +0200 Subject: [PATCH] --- yaml --- r: 219843 b: refs/heads/master c: 09686b560ff229bc6c87489717dce118c7d2b20b h: refs/heads/master i: 219841: 129fad8f4ce6eb2881a08e082d645df86937da3a 219839: 4ea709f1194cb609124a0bb51f7f2aab9b63212c v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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); }