Commit 5c1e688388f629e8d8e88183b5ebc21e209252aa
Committed by
David S. Miller
David S. Miller
1 parent
b7e4338126
Exists in
master
and in
4 other branches
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>
Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff
drivers/net/tg3.c
| ... | ... | @@ -6234,12 +6234,10 @@ |
| 6234 | 6234 | } |
| 6235 | 6235 | } |
| 6236 | 6236 | |
| 6237 | -#ifdef BCM_KERNEL_SUPPORTS_8021Q | |
| 6238 | 6237 | if (vlan_tx_tag_present(skb)) { |
| 6239 | 6238 | base_flags |= TXD_FLAG_VLAN; |
| 6240 | 6239 | vlan = vlan_tx_tag_get(skb); |
| 6241 | 6240 | } |
| 6242 | -#endif | |
| 6243 | 6241 | |
| 6244 | 6242 | if (tg3_flag(tp, USE_JUMBO_BDFLAG) && |
| 6245 | 6243 | !mss && skb->len > VLAN_ETH_FRAME_LEN) |