diff --git a/[refs] b/[refs] index 1296197264a0..ca1fc990a866 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3d84a4dd22c727f5ed64453c72183c242ac9c19 +refs/heads/master: 7e36763b2c204d59de4e88087f84a2c0c8421f25 diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index aef01533dfb6..d9a02b2cc289 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/net/core/neighbour.c @@ -839,7 +839,7 @@ static void neigh_timer_handler(unsigned long arg) struct sk_buff *skb = skb_peek(&neigh->arp_queue); /* keep skb alive even if arp_queue overflows */ if (skb) - skb_get(skb); + skb = skb_copy(skb, GFP_ATOMIC); write_unlock(&neigh->lock); neigh->ops->solicit(neigh, skb); atomic_inc(&neigh->probes);