]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit53ff21750d70237e0338a2fba30d95fd82d9a3a8
tree25c620a960fbcb491264e873f10c5169b98d2bb8
parent71f696b1e6d737494791a5ff180043e7740cdabf
tg3: fix VLAN tagging regression

commit 6681ad984b87c200c16c495759515379abd79b14
    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