git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net: bug fix for vlan + gro issue
[safe/jmp/linux-2.6]
/
net
/
core
/
dev.c
diff --git
a/net/core/dev.c
b/net/core/dev.c
index
be9924f
..
ec87421
100644
(file)
--- a/
net/core/dev.c
+++ b/
net/core/dev.c
@@
-2761,7
+2761,7
@@
gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,
switch (ret) {
case GRO_NORMAL:
case GRO_HELD:
- skb->protocol = eth_type_trans(skb,
napi
->dev);
+ skb->protocol = eth_type_trans(skb,
skb
->dev);
if (ret == GRO_HELD)
skb_gro_pull(skb, -ETH_HLEN);