xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	net/mac80211/rc80211_pid_algo.c
This commit is contained in:
David S. Miller
2008-03-05 12:26:41 -08:00
parent 9a43b709a2 0d66afe780
commit 255333c1db
34 changed files with 115 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/neighbour.c
View File

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