[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150720095538.GA13740@gondor.apana.org.au>
Date: Mon, 20 Jul 2015 17:55:38 +0800
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Wolfgang Walter <linux@...m.de>
Cc: netdev@...r.kernel.org, Tom Herbert <tom@...bertland.com>,
Eric Dumazet <eric.dumazet@...il.com>
Subject: Revert "sit: Add gro callbacks to sit_offload"
On Mon, Jul 20, 2015 at 11:39:52AM +0200, Wolfgang Walter wrote:
>
> > Can you confirm that disabling tso on eth1 does not help?
>
> Disabling TSO on eth1 does not help.
OK, in that case I think the safest option is to just disable
SIT GRO. If folks need this then they should make sure that
it works properly, i.e., the packets generated by GRO must be
in a form that GSO can grok. Also it should not cause hardware
TX to lock up (though this may yet turn out to be a hardware
bug).
---8<---
This patch reverts 19424e052fb44da2f00d1a868cbb51f3e9f4bbb5 ("sit:
Add gro callbacks to sit_offload") because it generates packets
that cannot be handled even by our own GSO.
Reported-by: Wolfgang Walter <linux@...m.de>
Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index e893cd1..08b6204 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -292,8 +292,6 @@ static struct packet_offload ipv6_packet_offload __read_mostly = {
static const struct net_offload sit_offload = {
.callbacks = {
.gso_segment = ipv6_gso_segment,
- .gro_receive = ipv6_gro_receive,
- .gro_complete = ipv6_gro_complete,
},
};
--
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists