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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
wangbin579 · Jul 14, 2011 · 6c9c1b5 · 6c9c1b5
1 parent 512e400
commit 6c9c1b5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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;