From e0c655374fec360e8689d3560b547cc1d3605171 Mon Sep 17 00:00:00 2001
From: Kasper Pedersen <kernel@kasperkp.dk>
Date: Tue, 20 Sep 2011 12:41:17 +0000
Subject: [PATCH] --- yaml --- r: 264062 b: refs/heads/master c:
 5c1e688388f629e8d8e88183b5ebc21e209252aa h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3bd7a52d414c..ee188fcf22b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e43381260e56840fd2fa582565c362d2fba1d9
+refs/heads/master: 5c1e688388f629e8d8e88183b5ebc21e209252aa
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index dc3fbf61910b..4a1374df6084 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6234,12 +6234,10 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		}
 	}
 
-#ifdef BCM_KERNEL_SUPPORTS_8021Q
 	if (vlan_tx_tag_present(skb)) {
 		base_flags |= TXD_FLAG_VLAN;
 		vlan = vlan_tx_tag_get(skb);
 	}
-#endif
 
 	if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)