summaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-07-14 14:39:29 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-14 14:39:29 -0700
commit6c9c1b5456e3ba0b4a1a43866600e84bbba0db12 (patch)
tree3f8e183f36b9ba7c191a12a89cfe156d9230d676 /net/8021q
parent512e4002ab9ac54a2d8f7f198a9cd503dcc3c161 (diff)
downloadlinux-stable-6c9c1b5456e3ba0b4a1a43866600e84bbba0db12.tar.gz
linux-stable-6c9c1b5456e3ba0b4a1a43866600e84bbba0db12.tar.bz2
linux-stable-6c9c1b5456e3ba0b4a1a43866600e84bbba0db12.zip
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>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan_dev.c3
1 files changed, 1 insertions, 2 deletions
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;