From: Kasper Pedersen <kernel@kasperkp.dk>
Date: Tue, 20 Sep 2011 12:41:17 +0000 (+0000)
Subject: tg3: fix VLAN tagging regression
X-Git-Tag: v2.6.39-400.9.0~495
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fd3ae7bf8f9e1987961aa4ecec7f794f424815c9;p=users%2Fjedix%2Flinux-maple.git

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>
(cherry picked from commit 5c1e688388f629e8d8e88183b5ebc21e209252aa)

Conflicts:
	drivers/net/tg3.c

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e3071c16c9e3..12281082b304 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -6724,12 +6724,10 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	    !mss && skb->len > VLAN_ETH_FRAME_LEN)
 		base_flags |= TXD_FLAG_JMB_PKT;
 
-#ifdef BCM_KERNEL_SUPPORTS_8021Q
 	if (vlan_tx_tag_present(skb)) {
 		base_flags |= TXD_FLAG_VLAN;
 		vlan = vlan_tx_tag_get(skb);
 	}
-#endif
 
 	len = skb_headlen(skb);