diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-10-24 14:47:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-27 06:01:18 +0100 |
| commit | 7e3b6e7423d5f994257c1de88e06b509673fdbcf (patch) | |
| tree | 3ec54ff1c7afd8d2a90c2eadae3b489f070a1d93 | |
| parent | Merge branch 'sh_eth-fixes' (diff) | |
| download | linux-7e3b6e7423d5f994257c1de88e06b509673fdbcf.tar.xz linux-7e3b6e7423d5f994257c1de88e06b509673fdbcf.zip | |
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>
| -rw-r--r-- | net/ipv4/gre_offload.c | 3 |
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) |