diff options
| author | Kasper Pedersen <kernel@kasperkp.dk> | 2011-09-20 12:41:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-21 02:14:12 -0400 |
| commit | 5c1e688388f629e8d8e88183b5ebc21e209252aa (patch) | |
| tree | 25c620a960fbcb491264e873f10c5169b98d2bb8 /drivers | |
| parent | b7e43381260e56840fd2fa582565c362d2fba1d9 (diff) | |
| download | kernel-common-5c1e688388f629e8d8e88183b5ebc21e209252aa.tar.gz kernel-common-5c1e688388f629e8d8e88183b5ebc21e209252aa.tar.bz2 kernel-common-5c1e688388f629e8d8e88183b5ebc21e209252aa.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index dc3fbf61910b..4a1374df6084 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -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) |