]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv6: gre: support SIT encapsulation
authorEric Dumazet <edumazet@google.com>
Sat, 24 Oct 2015 12:47:44 +0000 (05:47 -0700)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 16 Nov 2015 11:27:18 +0000 (11:27 +0000)
commit 7e3b6e7423d5f994257c1de88e06b509673fdbcf upstream.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
net/ipv4/gre_offload.c

index d7a1f450653d8527ef9ec9909fbeb4ad78a6bc2d..85c84f487d595e272c867a2ef5d6cc2a6a7911a5 100644 (file)
@@ -43,7 +43,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 (unlikely(!pskb_may_pull(skb, sizeof(*greh))))