You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.1 KiB
68 lines
2.1 KiB
4 years ago
|
From ab910fa64a2981ba829ba09faacecf273220aa45 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:55:23 -0400
|
||
|
|
Subject: [PATCH 206/312] [netdrv] net/mlx5e: Fix q counters on uplink
|
||
|
|
representors
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-118-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306990
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 117/124] net/mlx5e: Fix q counters on uplink representors
|
||
|
|
Bugzilla: 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Upstream: v5.7-rc5
|
||
|
|
|
||
|
|
commit 67b38de646894c9a94fe4d6d17719e70cc6028eb
|
||
|
|
Author: Roi Dayan <roid@mellanox.com>
|
||
|
|
Date: Thu Apr 23 12:37:21 2020 +0300
|
||
|
|
|
||
|
|
net/mlx5e: Fix q counters on uplink representors
|
||
|
|
|
||
|
|
Need to allocate the q counters before init_rx which needs them
|
||
|
|
when creating the rq.
|
||
|
|
|
||
|
|
Fixes: 8520fa57a4e9 ("net/mlx5e: Create q counters on uplink representors")
|
||
|
|
Signed-off-by: Roi Dayan <roid@mellanox.com>
|
||
|
|
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 ++-------
|
||
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
index e8845a6121dd..7ba784575a23 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
@@ -1664,19 +1664,14 @@ static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv)
|
||
|
|
|
||
|
|
static int mlx5e_init_ul_rep_rx(struct mlx5e_priv *priv)
|
||
|
|
{
|
||
|
|
- int err = mlx5e_init_rep_rx(priv);
|
||
|
|
-
|
||
|
|
- if (err)
|
||
|
|
- return err;
|
||
|
|
-
|
||
|
|
mlx5e_create_q_counters(priv);
|
||
|
|
- return 0;
|
||
|
|
+ return mlx5e_init_rep_rx(priv);
|
||
|
|
}
|
||
|
|
|
||
|
|
static void mlx5e_cleanup_ul_rep_rx(struct mlx5e_priv *priv)
|
||
|
|
{
|
||
|
|
- mlx5e_destroy_q_counters(priv);
|
||
|
|
mlx5e_cleanup_rep_rx(priv);
|
||
|
|
+ mlx5e_destroy_q_counters(priv);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int mlx5e_init_uplink_rep_tx(struct mlx5e_rep_priv *rpriv)
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|