commit 5c1e688388f629e8d8e88183b5ebc21e209252aa
Author: Kasper Pedersen <kernel@kasperkp.dk>
Date:   Tue Sep 20 12:41:17 2011 +0000

    tg3: fix VLAN tagging regression
    
    commit 92cd3a17ce9c719abb4c28dee3438e0c641f8de4
        tg3: Simplify tx bd assignments
    
    broke VLAN tagging on outbound packets.
    It ifdef'ed BCM_KERNEL_SUPPORTS_8021Q, but this
    is not set anywhere. So vlan never gets set, and
    all packets are sent with vlan=0.
    
    v2: We can just remove the test. vlan_tx_tag_present
    is valid regardless of whether the 802.1q module
    is built.
    
    Tested on BCM5721 rev 11.
    
    Signed-off-by: Kasper Pedersen <kernel@kasperkp.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>

    Applied by: Akemi Yagi <toracat@centos.org>

--- a/drivers/net/tg3.c.dist	2012-03-17 01:18:24.198410806 -0700
+++ b/drivers/net/tg3.c.new	2012-03-17 01:19:24.553357938 -0700
@@ -5866,12 +5866,10 @@
 		}
 	}
 
-#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)