ip4ip6: Support for GSO/GRO

[cascardo/linux.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 74b35e4..823dad1 100644 (file)
--- 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) {
@@ -1242,6 +1247,11 @@ ip6ip6_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_IPV6);
+
        err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
                           IPPROTO_IPV6);
        if (err != 0) {
@@ -1640,6 +1650,11 @@ static const struct net_device_ops ip6_tnl_netdev_ops = {
        .ndo_get_iflink = ip6_tnl_get_iflink,
 };
 
+#define IPXIPX_FEATURES (NETIF_F_SG |          \
+                        NETIF_F_FRAGLIST |     \
+                        NETIF_F_HIGHDMA |      \
+                        NETIF_F_GSO_SOFTWARE | \
+                        NETIF_F_HW_CSUM)
 
 /**
  * ip6_tnl_dev_setup - setup virtual tunnel device
@@ -1659,6 +1674,10 @@ static void ip6_tnl_dev_setup(struct net_device *dev)
        dev->addr_len = sizeof(struct in6_addr);
        dev->features |= NETIF_F_LLTX;
        netif_keep_dst(dev);
+
+       dev->features           |= IPXIPX_FEATURES;
+       dev->hw_features        |= IPXIPX_FEATURES;
+
        /* This perm addr will be used as interface identifier by IPv6 */
        dev->addr_assign_type = NET_ADDR_RANDOM;
        eth_random_addr(dev->perm_addr);