---

yaml --- r: 75488 b: refs/heads/master c: 9cd4002 h: refs/heads/master v: v3
git-mirror · Jan 10, 2008 · 0783c43 · 0783c43
1 parent 3159dbe
commit 0783c43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0de8e402dc5d3ee04f4d0f669ae492a3e569933
+refs/heads/master: 9cd40029423701c376391da59d2c6469672b4bed
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -1316,8 +1316,6 @@ 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;
 		}
@@ -1328,6 +1326,8 @@ 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);
 }