]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
net/mlx4_en: Fix wrong limitation for number of TX rings
authorTariq Toukan <tariqt@mellanox.com>
Mon, 18 Nov 2019 09:41:04 +0000 (11:41 +0200)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:21:14 +0000 (14:21 -0300)
commit045b7e216c868308930f8f8f4e62dcb245bb26f8
tree6f91a03bd37c9f2d46ef0c56a34e42d64bbfdbf1
parent5958d59cfd603e83c6f4271b8196c9ac7ecb96b7
net/mlx4_en: Fix wrong limitation for number of TX rings

BugLink: https://bugs.launchpad.net/bugs/1854975
[ Upstream commit 2744bf42680f64ebf2ee8a00354897857c073331 ]

XDP_TX rings should not be limited by max_num_tx_rings_p_up.
To make sure total number of TX rings never exceed MAX_TX_RINGS,
add similar check in mlx4_en_alloc_tx_queue_per_tc(), where
a new value is assigned for num_up.

Fixes: 7e1dc5e926d5 ("net/mlx4_en: Limit the number of TX rings")
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c