|
 |
d8f823 |
From 05970587bb399a2746dd10cb62e460e7ef1ff528 Mon Sep 17 00:00:00 2001
|
|
|
d8f823 |
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Date: Tue, 19 May 2020 07:48:45 -0400
|
|
|
d8f823 |
Subject: [PATCH 223/312] [netdrv] net/mlx5e: Fix an IS_ERR() vs NULL check
|
|
|
d8f823 |
|
|
|
d8f823 |
Message-id: <20200519074934.6303-15-ahleihel@redhat.com>
|
|
|
d8f823 |
Patchwork-id: 310520
|
|
|
d8f823 |
Patchwork-instance: patchwork
|
|
|
d8f823 |
O-Subject: [RHEL8.3 BZ 1663246 14/63] net/mlx5e: Fix an IS_ERR() vs NULL check
|
|
|
d8f823 |
Bugzilla: 1663246
|
|
|
d8f823 |
RH-Acked-by: Marcelo Leitner <mleitner@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: John Linville <linville@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Ivan Vecera <ivecera@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Bugzilla: http://bugzilla.redhat.com/1663246
|
|
|
d8f823 |
Upstream: v5.7-rc1
|
|
|
d8f823 |
|
|
|
d8f823 |
commit d9fb932fde217b15eab2111605b05a05b47ea593
|
|
|
d8f823 |
Author: Dan Carpenter <dan.carpenter@oracle.com>
|
|
|
d8f823 |
Date: Wed Mar 4 17:22:24 2020 +0300
|
|
|
d8f823 |
|
|
|
d8f823 |
net/mlx5e: Fix an IS_ERR() vs NULL check
|
|
|
d8f823 |
|
|
|
d8f823 |
The esw_vport_tbl_get() function returns error pointers on error.
|
|
|
d8f823 |
|
|
|
d8f823 |
Fixes: 96e326878fa5 ("net/mlx5e: Eswitch, Use per vport tables for mirroring")
|
|
|
d8f823 |
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
|
d8f823 |
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
|
d8f823 |
---
|
|
|
d8f823 |
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
|
|
|
d8f823 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
d8f823 |
|
|
|
d8f823 |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
index 8b7a2b095ec3..25665ff7e9c5 100644
|
|
|
d8f823 |
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
|
|
|
d8f823 |
@@ -196,7 +196,7 @@ int mlx5_esw_vport_tbl_get(struct mlx5_eswitch *esw)
|
|
|
d8f823 |
mlx5_esw_for_all_vports(esw, i, vport) {
|
|
|
d8f823 |
attr.in_rep->vport = vport->vport;
|
|
|
d8f823 |
fdb = esw_vport_tbl_get(esw, &attr);
|
|
|
d8f823 |
- if (!fdb)
|
|
|
d8f823 |
+ if (IS_ERR(fdb))
|
|
|
d8f823 |
goto out;
|
|
|
d8f823 |
}
|
|
|
d8f823 |
return 0;
|
|
|
d8f823 |
--
|
|
|
d8f823 |
2.13.6
|
|
|
d8f823 |
|