From: Michał Mirosław Date: Thu, 14 Jul 2011 21:39:29 +0000 (-0700) Subject: net: vlan: remove reduntant check in ndo_fix_features callback X-Git-Tag: v3.1-rc1~316^2~137 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6c9c1b5456e3ba0b4a1a43866600e84bbba0db12;p=linux.git 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 Signed-off-by: David S. Miller --- diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index d8f45ba718b5..49bb75294b7d 100644 --- 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;