forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
	net/8021q/vlan_core.c
	net/core/dev.c
This commit is contained in:
David S. Miller 2009-03-01 21:35:16 -08:00
commit aa4abc9bcc
197 changed files with 5026 additions and 1151 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/core/dev.c
View file

@ -2487,6 +2487,9 @@ int napi_skb_finish(int ret, struct sk_buff *skb)
{
int err = NET_RX_SUCCESS;
if (netpoll_receive_skb(skb))
return NET_RX_DROP;
switch (ret) {
case GRO_NORMAL:
return netif_receive_skb(skb);
@ -2584,6 +2587,9 @@ int napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, int ret)
{
int err = NET_RX_SUCCESS;
if (netpoll_receive_skb(skb))
return NET_RX_DROP;
switch (ret) {
case GRO_NORMAL:
case GRO_HELD: