Commit 4e239fac authored Jun 17, 2016 by Nogah Frankel Committed by David S. Miller Jun 17, 2016

mlxsw: switchx2: Don't count internal TX header bytes to stats



Stop the SW TX counter from counting the TX header bytes
since they are not being sent out.

Fixes: e577516b ("mlxsw: Fix use-after-free bug in mlxsw_sx_port_xmit")
Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 63dcdd35

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

+4 −1

Original line number	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);
		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
		* unlikely case we simply drop the packet.
		*/