tg3: fix VLAN tagging regression
authorKasper Pedersen <kernel@kasperkp.dk>
Tue, 20 Sep 2011 12:41:17 +0000 (12:41 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2011 06:14:12 +0000 (02:14 -0400)
commit5c1e688388f629e8d8e88183b5ebc21e209252aa
tree25c620a960fbcb491264e873f10c5169b98d2bb8
parentb7e43381260e56840fd2fa582565c362d2fba1d9
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>
drivers/net/tg3.c