From 0c4f7c1539a25de5477e66d79b1d99308b3dd67e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 20 Jan 2008 16:39:03 -0800
Subject: [PATCH] --- yaml --- r: 75615 b: refs/heads/master c:
 cecbb63967b4f36701b9412a12377e8fe006a93b h: refs/heads/master i:   75613:
 377abc05e19f84c60a9f8513f2cc5972f7417cbd   75611:
 720d8d09684deee9a916c35b15d6536faeac0bf6   75607:
 e5f56e24ee6a29132f5143a6ee09b2f13b7b9cbe   75599:
 74fc6058544c15cdd5ebe26b657d7bfaa19c8ef5   75583:
 e38cb39b854b8adc719a02c275b8ed9f2858a6f4 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d5b447ac537c..ab0fc28e9bd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dc2f207fb251666d2396fe1a69272b307ecc333
+refs/heads/master: cecbb63967b4f36701b9412a12377e8fe006a93b
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index cc8a2f190acf..29b8ee4e35d6 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -1316,6 +1316,8 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms)
 			*p = parms->next;
 			parms->dead = 1;
 			write_unlock_bh(&tbl->lock);
+			if (parms->dev)
+				dev_put(parms->dev);
 			call_rcu(&parms->rcu_head, neigh_rcu_free_parms);
 			return;
 		}
@@ -1326,8 +1328,6 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms)
 
 void neigh_parms_destroy(struct neigh_parms *parms)
 {
-	if (parms->dev)
-		dev_put(parms->dev);
 	kfree(parms);
 }