Commit 6c9c1b54 authored Jul 14, 2011 by Michał Mirosław Committed by David S. Miller Jul 14, 2011

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>

parent 512e4002

net/8021q/vlan_dev.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -593,7 +593,6 @@ 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;

		if (dev_ethtool_get_rx_csum(real_dev))