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

Commit b47ac27a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-fixes' 



Jiri Pirko says:

====================
mlxsw: couple of fixes

Couple of slowpath tx stats fixes for Spectrum and SwitchX-2.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f1d048f2 4e239fac

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -408,7 +408,11 @@ static netdev_tx_t mlxsw_sp_port_xmit(struct sk_buff *skb, 
	}

	}





	mlxsw_sp_txhdr_construct(skb, &tx_info);

	mlxsw_sp_txhdr_construct(skb, &tx_info);

	len = skb->len;

	/* TX header is consumed by HW on the way so we shouldn't count its

	 * bytes as being sent.

	 */

	len = skb->len - MLXSW_TXHDR_LEN;



	/* Due to a race we might fail here because of a full queue. In that

	/* Due to a race we might fail here because of a full queue. In that

	 * unlikely case we simply drop the packet.

	 * unlikely case we simply drop the packet.

	 */

	 */

drivers/net/ethernet/mellanox/mlxsw/switchx2.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,10 @@ static netdev_tx_t mlxsw_sx_port_xmit(struct sk_buff *skb, 
		}

		}

	}

	}

	mlxsw_sx_txhdr_construct(skb, &tx_info);

	mlxsw_sx_txhdr_construct(skb, &tx_info);

	len = skb->len;

	/* TX header is consumed by HW on the way so we shouldn't count its

	 * bytes as being sent.

	 */

	len = skb->len - MLXSW_TXHDR_LEN;

	/* Due to a race we might fail here because of a full queue. In that

	/* Due to a race we might fail here because of a full queue. In that

	 * unlikely case we simply drop the packet.

	 * unlikely case we simply drop the packet.

	 */

	 */