diff options
| author |   Tariq Toukan <tariqt@mellanox.com> | 2019-09-16 17:43:33 +0300 |
|---|---|---|
| committer |   Saeed Mahameed <saeedm@mellanox.com> | 2019-10-18 12:11:51 -0700 |
| commit | 0c258dec8d98af15b34dbffdb89c008b6da01ff8 (patch) | |
| tree | 82b4cec305b7077f87397e2caa354488e0504006 /drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | |
| parent | net: usb: lan78xx: Connect PHY before registering MAC (diff) | |
| download | linux-dev-0c258dec8d98af15b34dbffdb89c008b6da01ff8.tar.xz linux-dev-0c258dec8d98af15b34dbffdb89c008b6da01ff8.zip | |
net/mlx5e: Tx, Fix assumption of single WQEBB of NOP in cleanup flow
Cited patch removed the assumption only in datapath.
Here we remove it also form control/cleanup flow.
Fixes: 9ab0233728ca ("net/mlx5e: Tx, Don't implicitly assume SKB-less wqe has one WQEBB")
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index d3a67a9b4eba..9094e9519db7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -550,8 +550,8 @@ void mlx5e_free_txqsq_descs(struct mlx5e_txqsq *sq) wi = &sq->db.wqe_info[ci]; skb = wi->skb; - if (!skb) { /* nop */ - sq->cc++; + if (!skb) { + sq->cc += wi->num_wqebbs; continue; } |