git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
tg3.c
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index
f7efcec
..
1205c2a
100644
(file)
--- a/
drivers/net/tg3.c
+++ b/
drivers/net/tg3.c
@@
-4392,7
+4392,7
@@
static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key,
#if TG3_VLAN_TAG_USED
static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
{
#if TG3_VLAN_TAG_USED
static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag)
{
- return vlan_
hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag
);
+ return vlan_
gro_receive(&tp->napi, tp->vlgrp, vlan_tag, skb
);
}
#endif
}
#endif
@@
-4539,7
+4539,7
@@
static int tg3_rx(struct tg3 *tp, int budget)
desc->err_vlan & RXD_VLAN_MASK);
} else
#endif
desc->err_vlan & RXD_VLAN_MASK);
} else
#endif
- n
etif_receive_skb(
skb);
+ n
api_gro_receive(&tp->napi,
skb);
received++;
budget--;
received++;
budget--;