]> git.hungrycats.org Git - linux/commitdiff
ipv6: gre: support SIT encapsulation
authorEric Dumazet <edumazet@google.com>
Sat, 24 Oct 2015 12:47:44 +0000 (05:47 -0700)
committerSasha Levin <sasha.levin@oracle.com>
Thu, 3 Dec 2015 15:18:20 +0000 (10:18 -0500)
[ Upstream commit 7e3b6e7423d5f994257c1de88e06b509673fdbcf ]

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: Sasha Levin <sasha.levin@oracle.com>
net/ipv4/gre_offload.c

index 51973ddc05a68463f8f39e779491374f12e5191a..abc50b41bc39cb3b5aff9a633cab95afae8b5346 100644 (file)
@@ -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)