From c48bf08425b265088d7f42d75295a99d2f67878c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Thu, 14 Jul 2011 14:39:29 -0700 Subject: [PATCH] --- yaml --- r: 256307 b: refs/heads/master c: 6c9c1b5456e3ba0b4a1a43866600e84bbba0db12 h: refs/heads/master i: 256305: a4ec08579b73d55a101b972f78b383b3d5e90f5d 256303: 5d0e1362ca5522efbb9fa0b4335da34a2d953da8 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan_dev.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e14a0df5fba4..3d92ea477b2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 512e4002ab9ac54a2d8f7f198a9cd503dcc3c161 +refs/heads/master: 6c9c1b5456e3ba0b4a1a43866600e84bbba0db12 diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c index d8f45ba718b5..49bb75294b7d 100644 --- a/trunk/net/8021q/vlan_dev.c +++ b/trunk/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;