OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
512e400
)
net: vlan: remove reduntant check in ndo_fix_features callback
author
Michał Mirosław
<mirq-linux@rere.qmqm.pl>
Thu, 14 Jul 2011 21:39:29 +0000
(14:39 -0700)
committer
David S. Miller
<davem@davemloft.net>
Thu, 14 Jul 2011 21:39:29 +0000
(14:39 -0700)
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>
net/8021q/vlan_dev.c
patch
|
blob
|
history
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index
d8f45ba
..
49bb752
100644
(file)
--- 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;