diff options
author | Ajit Khaparde <ajitkhaparde@gmail.com> | 2010-02-16 15:25:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 18:59:47 -0500 |
commit | e76b69cc0133952c98aa1ad6330cacacd269fd64 (patch) | |
tree | d06aa21c325692e8e97b6d73f34bc05319a586cf /net/core | |
parent | 1d4bd947c501ea1da81300280fb6aeec2cca9335 (diff) |
net: bug fix for vlan + gro issue
Traffic (tcp) doesnot start on a vlan interface when gro is enabled.
Even the tcp handshake was not taking place.
This is because, the eth_type_trans call before the netif_receive_skb
in napi_gro_finish() resets the skb->dev to napi->dev from the previously
set vlan netdev interface. This causes the ip_route_input to drop the
incoming packet considering it as a packet coming from a martian source.
I could repro this on 2.6.32.7 (stable) and 2.6.33-rc7.
With this fix, the traffic starts and the test runs fine on both vlan
and non-vlan interfaces.
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: Patrick McHardy <kaber@trash.net>
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index d1cf53d0d597..1968980f513a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2813,7 +2813,7 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, | |||
2813 | switch (ret) { | 2813 | switch (ret) { |
2814 | case GRO_NORMAL: | 2814 | case GRO_NORMAL: |
2815 | case GRO_HELD: | 2815 | case GRO_HELD: |
2816 | skb->protocol = eth_type_trans(skb, napi->dev); | 2816 | skb->protocol = eth_type_trans(skb, skb->dev); |
2817 | 2817 | ||
2818 | if (ret == GRO_HELD) | 2818 | if (ret == GRO_HELD) |
2819 | skb_gro_pull(skb, -ETH_HLEN); | 2819 | skb_gro_pull(skb, -ETH_HLEN); |