]> www.infradead.org Git - users/jedix/linux-maple.git/commit
tg3: fix VLAN tagging regression
authorKasper Pedersen <kernel@kasperkp.dk>
Tue, 20 Sep 2011 12:41:17 +0000 (12:41 +0000)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 29 Nov 2012 06:50:58 +0000 (22:50 -0800)
commit46fa32068785c2bb4e7f170a9db73331363d2eac
treeee69cbc745d022a1b8e19eeba8f5896bb1dc4c67
parentf229693f043f91bf26b6c4cc1a5889404ee0acc5
tg3: fix VLAN tagging regression

Orabug: 15929836
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>
drivers/net/tg3.c