summaryrefslogtreecommitdiff
path: root/net/ipv4/gre_offload.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-10-24 05:47:44 -0700
committerDavid S. Miller <davem@davemloft.net>2015-10-26 22:01:18 -0700
commit7e3b6e7423d5f994257c1de88e06b509673fdbcf (patch)
tree3ec54ff1c7afd8d2a90c2eadae3b489f070a1d93 /net/ipv4/gre_offload.c
parent3242c9ee0b6104c901336a9498bb7ec64923eb1f (diff)
downloadlinux-sh-7e3b6e7423d5f994257c1de88e06b509673fdbcf.tar.gz
ipv6: gre: support SIT encapsulation
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>
Diffstat (limited to 'net/ipv4/gre_offload.c')
-rw-r--r--net/ipv4/gre_offload.c3
1 files changed, 2 insertions, 1 deletions
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)