From 6c9c1b5456e3ba0b4a1a43866600e84bbba0db12 Mon Sep 17 00:00:00 2001 From: Michał Mirosław Date: Thu, 14 Jul 2011 14:39:29 -0700 Subject: net: vlan: remove reduntant check in ndo_fix_features callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the fact that ORing with zero is a no-op. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller --- net/8021q/vlan_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'net') 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; -- cgit v1.2.3