diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-10-24 05:47:44 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-12-03 10:18:20 -0500 |
| commit | bcabffc26b55c2e2da5ed249e7488d5494eebc30 (patch) | |
| tree | ab05e56b9a6c3371b53dd77490e8c8ca067ef092 /net/ipv4/gre_offload.c | |
| parent | 19f59729257b2e3c7de8560f3bdfe293ab8d5553 (diff) | |
| download | lwn-bcabffc26b55c2e2da5ed249e7488d5494eebc30.tar.gz lwn-bcabffc26b55c2e2da5ed249e7488d5494eebc30.zip | |
ipv6: gre: support SIT encapsulation
[ 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>
Diffstat (limited to 'net/ipv4/gre_offload.c')
| -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 51973ddc05a6..abc50b41bc39 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) |