---

yaml --- r: 256307 b: refs/heads/master c: 6c9c1b5 h: refs/heads/master i: 256305: a4ec085 256303: 5d0e136 v: v3
git-mirror · Jul 14, 2011 · c48bf08 · c48bf08
1 parent 13cb540
commit c48bf08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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;