From: Roi Dayan <roid@nvidia.com>

Date: Wed, 2 Nov 2022 23:55:46 -0700

Subject: net/mlx5e: E-Switch, Fix comparing termination table instance

Patch-mainline: v6.1-rc5

Git-commit: f4f4096b410e8d31c3f07f39de3b17d144edd53d

References: jsc#PED-1549

The pkt_reformat pointer being saved under flow_act and not

dest attribute in the termination table instance.

Fix the comparison pointers.

Also fix returning success if one pkt_reformat pointer is null

and the other is not.

Fixes: 249ccc3c95bd ("net/mlx5e: Add support for offloading traffic from uplink to uplink")

Signed-off-by: Roi Dayan <roid@nvidia.com>

Reviewed-by: Chris Mi <cmi@nvidia.com>

Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c |   14 +++++-----

 1 file changed, 8 insertions(+), 6 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c

@@ -30,9 +30,9 @@ mlx5_eswitch_termtbl_hash(struct mlx5_fl

 		     sizeof(dest->vport.num), hash);

 	hash = jhash((const void *)&dest->vport.vhca_id,

 		     sizeof(dest->vport.num), hash);

-	if (dest->vport.pkt_reformat)

-		hash = jhash(dest->vport.pkt_reformat,

-			     sizeof(*dest->vport.pkt_reformat),

+	if (flow_act->pkt_reformat)

+		hash = jhash(flow_act->pkt_reformat,

+			     sizeof(*flow_act->pkt_reformat),

 			     hash);

 	return hash;

 }

@@ -53,9 +53,11 @@ mlx5_eswitch_termtbl_cmp(struct mlx5_flo

 	if (ret)

 		return ret;

-	return dest1->vport.pkt_reformat && dest2->vport.pkt_reformat ?

-	       memcmp(dest1->vport.pkt_reformat, dest2->vport.pkt_reformat,

-		      sizeof(*dest1->vport.pkt_reformat)) : 0;

+	if (flow_act1->pkt_reformat && flow_act2->pkt_reformat)

+		return memcmp(flow_act1->pkt_reformat, flow_act2->pkt_reformat,

+			      sizeof(*flow_act1->pkt_reformat));

+

+	return !(flow_act1->pkt_reformat == flow_act2->pkt_reformat);

 }

 static int