---

yaml --- r: 75615 b: refs/heads/master c: cecbb63 h: refs/heads/master i: 75613: 377abc0 75611: 720d8d0 75607: e5f56e2 75599: 74fc605 75583: e38cb39 v: v3
git-mirror · Jan 21, 2008 · 0c4f7c1 · 0c4f7c1
1 parent 0d2af33
commit 0c4f7c1
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: 2dc2f207fb251666d2396fe1a69272b307ecc333
+refs/heads/master: cecbb63967b4f36701b9412a12377e8fe006a93b
diff --git 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);
 }