1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index e0804599fcae..696b99e65a5a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -575,15 +575,14 @@ static void mlxsw_sp_span_entry_destroy(struct mlxsw_sp *mlxsw_sp,
 }
 
 static struct mlxsw_sp_span_entry *
-mlxsw_sp_span_entry_find(struct mlxsw_sp_port *port)
+mlxsw_sp_span_entry_find(struct mlxsw_sp *mlxsw_sp, u8 local_port)
 {
-        struct mlxsw_sp *mlxsw_sp = port->mlxsw_sp;
         int i;
 
         for (i = 0; i < mlxsw_sp->span.entries_count; i++) {
                 struct mlxsw_sp_span_entry *curr = &mlxsw_sp->span.entries[i];
 
-                if (curr->used && curr->local_port == port->local_port)
+                if (curr->used && curr->local_port == local_port)
                         return curr;
         }
         return NULL;
@@ -594,7 +593,8 @@ static struct mlxsw_sp_span_entry
 {
         struct mlxsw_sp_span_entry *span_entry;
 
-        span_entry = mlxsw_sp_span_entry_find(port);
+        span_entry = mlxsw_sp_span_entry_find(port->mlxsw_sp,
+                                              port->local_port);
         if (span_entry) {
                 /* Already exists, just take a reference */
                 span_entry->ref_count++;
@@ -783,12 +783,13 @@ err_port_bind:
 }
 
 static void mlxsw_sp_span_mirror_remove(struct mlxsw_sp_port *from,
-                                        struct mlxsw_sp_port *to,
+                                        u8 destination_port,
                                         enum mlxsw_sp_span_type type)
 {
         struct mlxsw_sp_span_entry *span_entry;
 
-        span_entry = mlxsw_sp_span_entry_find(to);
+        span_entry = mlxsw_sp_span_entry_find(from->mlxsw_sp,
+                                              destination_port);
         if (!span_entry) {
                 netdev_err(from->dev, "no span entry found\n");
                 return;
@@ -1563,14 +1564,12 @@ static void
 mlxsw_sp_port_del_cls_matchall_mirror(struct mlxsw_sp_port *mlxsw_sp_port,
                                       struct mlxsw_sp_port_mall_mirror_tc_entry *mirror)
 {
-        struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
         enum mlxsw_sp_span_type span_type;
-        struct mlxsw_sp_port *to_port;
 
-        to_port = mlxsw_sp->ports[mirror->to_local_port];
         span_type = mirror->ingress ?
                         MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;
-        mlxsw_sp_span_mirror_remove(mlxsw_sp_port, to_port, span_type);
+        mlxsw_sp_span_mirror_remove(mlxsw_sp_port, mirror->to_local_port,
+                                    span_type);
 }
 
 static int