diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-04 13:08:16 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-04 13:09:08 +0400 |
| commit | 22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch) | |
| tree | 5c3f2346804a186aa2d954f078fd2f4d44bcc26e /drivers/net/tg3.c | |
| parent | 557ab425429a5123d37f412ce3e6d6137cb621f8 (diff) | |
| parent | 0f86267b79bc6e357b8606077c7f70239045ea9c (diff) | |
| download | linux-22f92bacbeea24b20e447444c28e7cad9f1ac3f8.tar.xz | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/tg3.c')
| -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) |