net: bug fix for vlan + gro issue
authorAjit Khaparde <ajitkhaparde@gmail.com>
Tue, 16 Feb 2010 20:25:43 +0000 (20:25 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Feb 2010 23:59:47 +0000 (15:59 -0800)
commite76b69cc0133952c98aa1ad6330cacacd269fd64
treed06aa21c325692e8e97b6d73f34bc05319a586cf
parent1d4bd947c501ea1da81300280fb6aeec2cca9335
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>
net/core/dev.c