---

yaml --- r: 10064 b: refs/heads/master c: 6fb9974 h: refs/heads/master v: v3
git-mirror · Oct 23, 2005 · cff1f4b · cff1f4b
1 parent 73fe162
commit cff1f4b
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: 203755029e063066ecc4cf5eee1110ab946c2d88
+refs/heads/master: 6fb9974f49f7a6032118c5b6caa6e08e7097913e
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -816,10 +816,10 @@ static void neigh_timer_handler(unsigned long arg)
 	}
 
 	if (neigh->nud_state & NUD_IN_TIMER) {
-		neigh_hold(neigh);
 		if (time_before(next, jiffies + HZ/2))
 			next = jiffies + HZ/2;
-		neigh_add_timer(neigh, next);
+		if (!mod_timer(&neigh->timer, next))
+			neigh_hold(neigh);
 	}
 	if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) {
 		struct sk_buff *skb = skb_peek(&neigh->arp_queue);