Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b39a061 authored by Moni Shoua's avatar Moni Shoua Committed by David S. Miller
Browse files

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: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7208ca30

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -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