From 670e68e2a32d44a16a9ffb81b7f77555ac114997 Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Wed, 24 Nov 2010 13:14:50 +0000
Subject: [PATCH] --- yaml --- r: 224506 b: refs/heads/master c:
 19eb5cc559f716dc98ce03a5bad6030fdc71e897 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e9128c30d806..2d39a63a9ad1 100644
--- 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
index dc1071327d87..6e64f7c6a2e9 100644
--- 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);
 }