---

yaml --- r: 219903 b: refs/heads/master c: 7e8158b h: refs/heads/master i: 219901: 9ea5fdd 219899: 021d018 219895: 875efcd 219887: 020be63 219871: c3d369b 219839: 4ea709f 219775: 9137fd0 219647: 991ee1a v: v3
git-mirror · Sep 20, 2010 · 6154a6d · 6154a6d
1 parent 950e21c
commit 6154a6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 399fb5b445370ddcc93221e339d02736f55b9bb8
+refs/heads/master: 7e8158b341b2b043047b6f570c343fd9b0efd9c9
diff --git a/trunk/drivers/staging/batman-adv/hard-interface.c b/trunk/drivers/staging/batman-adv/hard-interface.c
@@ -111,9 +111,17 @@ static void set_primary_if(struct bat_priv *bat_priv,
 {
 	struct batman_packet *batman_packet;
 	struct vis_packet *vis_packet;
+	struct batman_if *old_if;
 
+	if (batman_if)
+		hardif_hold(batman_if);
+
+	old_if = bat_priv->primary_if;
 	bat_priv->primary_if = batman_if;
 
+	if (old_if)
+		hardif_put(old_if);
+
 	if (!bat_priv->primary_if)
 		return;