net: Remove references to NETIF_F_UFO in netdev_fix_features().
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Jul 2017 14:04:22 +0000 (07:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Jul 2017 16:52:58 +0000 (09:52 -0700)
It is going away.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 9f3f4083ada54c8812e8b22868d012874147b60d..467420eda02ecd84b37c0e6a032858dc26a4b551 100644 (file)
@@ -7271,24 +7271,6 @@ static netdev_features_t netdev_fix_features(struct net_device *dev,
                features &= ~NETIF_F_GSO;
        }
 
-       /* UFO needs SG and checksumming */
-       if (features & NETIF_F_UFO) {
-               /* maybe split UFO into V4 and V6? */
-               if (!(features & NETIF_F_HW_CSUM) &&
-                   ((features & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) !=
-                    (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM))) {
-                       netdev_dbg(dev,
-                               "Dropping NETIF_F_UFO since no checksum offload features.\n");
-                       features &= ~NETIF_F_UFO;
-               }
-
-               if (!(features & NETIF_F_SG)) {
-                       netdev_dbg(dev,
-                               "Dropping NETIF_F_UFO since no NETIF_F_SG feature.\n");
-                       features &= ~NETIF_F_UFO;
-               }
-       }
-
        /* GSO partial features require GSO partial be set */
        if ((features & dev->gso_partial_features) &&
            !(features & NETIF_F_GSO_PARTIAL)) {