net: vlan: remove reduntant check in ndo_fix_features callback

Use the fact that ORing with zero is a no-op.

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

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index d8f45ba718b56e08a8f7c309a2642b61bd381726..49bb75294b7d2335784d9bc8a1d2914dfa895a7c 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -593,8 +593,7 @@ static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
        features &= real_dev->features;
        features &= real_dev->vlan_features;
 
-       if (old_features & NETIF_F_SOFT_FEATURES)
-               features |= old_features & NETIF_F_SOFT_FEATURES;
+       features |= old_features & NETIF_F_SOFT_FEATURES;
 
        if (dev_ethtool_get_rx_csum(real_dev))
                features |= NETIF_F_RXCSUM;