diff options
| author | Nogah Frankel <nogahf@mellanox.com> | 2016-06-17 15:09:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-18 06:57:53 +0200 |
| commit | 4e239fac7c6b9d703e83c81b52ec9fec00c50129 (patch) | |
| tree | 9d3208177264ba4356c7f46a8691d39f558472b7 /drivers | |
| parent | mlxsw: spectrum: Don't count internal TX header bytes to stats (diff) | |
| download | linux-4e239fac7c6b9d703e83c81b52ec9fec00c50129.tar.xz linux-4e239fac7c6b9d703e83c81b52ec9fec00c50129.zip | |
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: e577516b9db3 ("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c index 3842eab9449a..25f658b3849a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c +++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c @@ -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. */ |