diff options
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 3 |
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) | |||
593 | features &= real_dev->features; | 593 | features &= real_dev->features; |
594 | features &= real_dev->vlan_features; | 594 | features &= real_dev->vlan_features; |
595 | 595 | ||
596 | if (old_features & NETIF_F_SOFT_FEATURES) | 596 | features |= old_features & NETIF_F_SOFT_FEATURES; |
597 | features |= old_features & NETIF_F_SOFT_FEATURES; | ||
598 | 597 | ||
599 | if (dev_ethtool_get_rx_csum(real_dev)) | 598 | if (dev_ethtool_get_rx_csum(real_dev)) |
600 | features |= NETIF_F_RXCSUM; | 599 | features |= NETIF_F_RXCSUM; |