---

yaml --- r: 264062 b: refs/heads/master c: 5c1e688 h: refs/heads/master v: v3
git-mirror · Sep 21, 2011 · e0c6553 · e0c6553
1 parent 6a58d36
commit e0c6553
Show file tree

Hide file tree

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