You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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>
This commit is contained in:
committed by
David S. Miller
parent
512e4002ab
commit
6c9c1b5456
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user