ipv6: Set features for IPv6 tunnels
authorTom Herbert <tom@herbertland.com>
Wed, 18 May 2016 16:06:21 +0000 (09:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2016 22:03:17 +0000 (18:03 -0400)
Need to set dev features, use same values that are used in GREv6.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c

index 74b35e4aacd98a6ac5a764ad65f655fcb9591f3c..cabf492a56dcdb4bd1d5ee81fee60d5e0203b208 100644 (file)
@@ -1640,6 +1640,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 +1664,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);