lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:davem330/net

Browse Source 
Conflicts:
	net/batman-adv/soft-interface.c
This commit is contained in:
David S. Miller
2011-10-07 13:38:43 -04:00
parent 8083f0fc96 3ee72ca992
commit 88c5100c28
178 changed files with 1255 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/packet/af_packet.c
View File

@ -1720,7 +1720,10 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
return 0;
drop_n_acct:
po->stats.tp_drops = atomic_inc_return(&sk->sk_drops);
spin_lock(&sk->sk_receive_queue.lock);
po->stats.tp_drops++;
atomic_inc(&sk->sk_drops);
spin_unlock(&sk->sk_receive_queue.lock);
drop_n_restore:
if (skb_head != skb->data && skb_shared(skb)) {