aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/neighbour.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 766caa0dd930..37d8d8c29522 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -816,10 +816,10 @@ static void neigh_timer_handler(unsigned long arg)
816 } 816 }
817 817
818 if (neigh->nud_state & NUD_IN_TIMER) { 818 if (neigh->nud_state & NUD_IN_TIMER) {
819 neigh_hold(neigh);
820 if (time_before(next, jiffies + HZ/2)) 819 if (time_before(next, jiffies + HZ/2))
821 next = jiffies + HZ/2; 820 next = jiffies + HZ/2;
822 neigh_add_timer(neigh, next); 821 if (!mod_timer(&neigh->timer, next))
822 neigh_hold(neigh);
823 } 823 }
824 if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) { 824 if (neigh->nud_state & (NUD_INCOMPLETE | NUD_PROBE)) {
825 struct sk_buff *skb = skb_peek(&neigh->arp_queue); 825 struct sk_buff *skb = skb_peek(&neigh->arp_queue);