diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-30 07:47:48 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-30 07:47:48 +0300 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /net/ipv6/ip6_offload.c | |
| parent | a523a5ecc8c6ddceb8f783f600605553e5ad8963 (diff) | |
| parent | 7a5a4f978750756755dc839014e13d1b088ccc8e (diff) | |
| download | linux-60b7379dc5b1743427b031cca53e30860a38ada6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/ip6_offload.c')
| -rw-r--r-- | net/ipv6/ip6_offload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c index fd76ce938c32..46d452a56d3e 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c @@ -69,7 +69,8 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, int nhoff; if (unlikely(skb_shinfo(skb)->gso_type & - ~(SKB_GSO_UDP | + ~(SKB_GSO_TCPV4 | + SKB_GSO_UDP | SKB_GSO_DODGY | SKB_GSO_TCP_ECN | SKB_GSO_GRE | |