net: remove legacy ethtool ops

As all drivers are converted, we may now remove discrete offload setting
callback handling.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 4 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index bc2528624583..6a4e0cb897b7 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -596,13 +596,11 @@ static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
         struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
         u32 old_features = features;
 
-        features &= real_dev->features;
         features &= real_dev->vlan_features;
+        features |= NETIF_F_RXCSUM;
+        features &= real_dev->features;
 
         features |= old_features & NETIF_F_SOFT_FEATURES;
-
-        if (dev_ethtool_get_rx_csum(real_dev))
-                features |= NETIF_F_RXCSUM;
         features |= NETIF_F_LLTX;
 
         return features;