aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorTom Herbert <tom@herbertland.com>2016-05-18 09:06:23 -0700
committerDavid S. Miller <davem@davemloft.net>2016-05-20 18:03:17 -0400
commitb8921ca83eed2496108ee308e9a41c5084089680 (patch)
tree9400ae3ef96f992095d518f057b0d6db970f90ee /net/ipv6/ip6_tunnel.c
parentip6ip6: Support for GSO/GRO (diff)
downloadlinux-dev-b8921ca83eed2496108ee308e9a41c5084089680.tar.xz
linux-dev-b8921ca83eed2496108ee308e9a41c5084089680.zip
ip4ip6: Support for GSO/GRO
Signed-off-by: Tom Herbert <tom@herbertland.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index d26d2269abec..823dad1e631b 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1188,6 +1188,11 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
fl6.flowi6_mark = skb->mark;
+ if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
+ return -1;
+
+ skb_set_inner_ipproto(skb, IPPROTO_IPIP);
+
err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
IPPROTO_IPIP);
if (err != 0) {