diff options
| author | Moni Shoua <monis@mellanox.co.il> | 2012-10-25 03:12:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-26 09:34:15 +0200 |
| commit | 2b39a06198a0fbaf44a69f435c5d2b4280a0c10e (patch) | |
| tree | bca809ec01e878ac067353017447afdc8a03e70c /drivers/net | |
| parent | net/mlx4_en: Fix double-release-range in tx-rings (diff) | |
| download | linux-2b39a06198a0fbaf44a69f435c5d2b4280a0c10e.tar.xz linux-2b39a06198a0fbaf44a69f435c5d2b4280a0c10e.zip | |
net/mlx4_en: Don't use vlan tag value as an indication for vlan presence
The vlan tag can be zero. This is why it can't serve as an indication
that packet requires VLAN header in the TX flow.
Signed-off-by: Moni Shoua <monis@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 0a51095fd8d6..b35094c590ba 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -711,7 +711,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) if (bounce) tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size); - if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tag) { + if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tx_tag_present(skb)) { *(__be32 *) (&tx_desc->ctrl.vlan_tag) |= cpu_to_be32(ring->doorbell_qpn); op_own |= htonl((bf_index & 0xffff) << 8); /* Ensure new descirptor hits memory |