leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c
This commit is contained in:
David S. Miller
2010-04-21 01:14:25 -07:00
parent ccb7c7732e 05d17608a6
commit 87eb367003
266 changed files with 4540 additions and 2576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_output.c
View File

@@ -120,7 +120,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
newskb->pkt_type = PACKET_LOOPBACK;
newskb->ip_summed = CHECKSUM_UNNECESSARY;
WARN_ON(!skb_dst(newskb));
netif_rx(newskb);
netif_rx_ni(newskb);
return 0;
}