---

yaml --- r: 224506 b: refs/heads/master c: 19eb5cc h: refs/heads/master v: v3
git-mirror · Nov 28, 2010 · 670e68e · 670e68e
1 parent d924f48
commit 670e68e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a0d2268d259886f0c87131639d19eb4a67b4532
+refs/heads/master: 19eb5cc559f716dc98ce03a5bad6030fdc71e897
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -341,9 +341,6 @@ static void vlan_transfer_features(struct net_device *dev,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
 	vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
 #endif
-	vlandev->real_num_tx_queues = dev->real_num_tx_queues;
-	BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues);
-
 	if (old_features != vlandev->features)
 		netdev_features_change(vlandev);
 }