From 072028a12f5b609879b5e693e174d8c9dd5490ec Mon Sep 17 00:00:00 2001
From: Frank Blaschka <frank.blaschka@de.ibm.com>
Date: Mon, 3 Mar 2008 12:16:04 -0800
Subject: [PATCH] --- yaml --- r: 86904 b: refs/heads/master c:
 7e36763b2c204d59de4e88087f84a2c0c8421f25 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);