From 6154a6d89429913def429868869a7fa44160349a Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 18 Sep 2010 21:01:21 +0200
Subject: [PATCH] --- yaml --- r: 219903 b: refs/heads/master c:
 7e8158b341b2b043047b6f570c343fd9b0efd9c9 h: refs/heads/master i:   219901:
 9ea5fdd8a21c25737a17e2ee9dcd60dac79c1d97   219899:
 021d018acccd46bddfa7a6625b2ae6e6f859b3b0   219895:
 875efcdf4349b390a151be4baa9b5bdadf001a56   219887:
 020be63c409d5821edb96bcfd4bde3b5ce149ad5   219871:
 c3d369b21b7f6844ae1d48d299c6acb1fb44f701   219839:
 4ea709f1194cb609124a0bb51f7f2aab9b63212c   219775:
 9137fd048ea7fbd2f183a30db87a99fa73aacc9f   219647:
 991ee1ab4022a70f518c9ca9c41fc031babe3019 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/batman-adv/hard-interface.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dcd4369f18c7..a07acd6fb525 100644
--- 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
index eef56318006b..a9d6f1d3a6b4 100644
--- 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;