* [PATCH net] ipv6: gre: support SIT encapsulation
@ 2015-10-24 12:47 Eric Dumazet
2015-10-27 5:01 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2015-10-24 12:47 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
gre_gso_segment() chokes if SIT frames were aggregated by GRO engine.
Fixes: 61c1db7fae21e ("ipv6: sit: add GSO/TSO support")
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/ipv4/gre_offload.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index 5aa46d4b44ef..5a8ee3282550 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -36,7 +36,8 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
SKB_GSO_TCP_ECN |
SKB_GSO_GRE |
SKB_GSO_GRE_CSUM |
- SKB_GSO_IPIP)))
+ SKB_GSO_IPIP |
+ SKB_GSO_SIT)))
goto out;
if (!skb->encapsulation)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] ipv6: gre: support SIT encapsulation
2015-10-24 12:47 [PATCH net] ipv6: gre: support SIT encapsulation Eric Dumazet
@ 2015-10-27 5:01 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-10-27 5:01 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 24 Oct 2015 05:47:44 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> gre_gso_segment() chokes if SIT frames were aggregated by GRO engine.
>
> Fixes: 61c1db7fae21e ("ipv6: sit: add GSO/TSO support")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied and queued up for -stable, thanks Eric.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-27 4:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24 12:47 [PATCH net] ipv6: gre: support SIT encapsulation Eric Dumazet
2015-10-27 5:01 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).