1 files changed, 4 insertions, 5 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index bc2528624583..2b5fcde1f629 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -591,18 +591,17 @@ static void vlan_dev_uninit(struct net_device *dev)
         }
 }
 
-static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
+static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
+        netdev_features_t 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;