Commit 5c1e6883 authored Sep 20, 2011 by Kasper Pedersen Committed by David S. Miller Sep 21, 2011

tg3: fix VLAN tagging regression



commit 92cd3a17
    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>

parent b7e43381

drivers/net/tg3.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message