Commit 45bce5c9 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Create common function for fib_entry_type_unset() code 



mlxsw_sp_fib4_entry_type_unset() is not specific for IPv4 FIB entry,
move the code to mlxsw_sp_fib_entry_type_unset(), and call this function
from mlxsw_sp_fib4_entry_type_unset() so then it will be used for IPv6
also.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2fcd14d0

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+10 −3
Original line number Diff line number Diff line
@@ -6069,7 +6069,7 @@ mlxsw_sp_fib4_entry_type_set(struct mlxsw_sp *mlxsw_sp, 
}



static void

mlxsw_sp_fib4_entry_type_unset(struct mlxsw_sp *mlxsw_sp,

mlxsw_sp_fib_entry_type_unset(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_fib_entry *fib_entry)

{

	switch (fib_entry->type) {
@@ -6081,6 +6081,13 @@ mlxsw_sp_fib4_entry_type_unset(struct mlxsw_sp *mlxsw_sp, 
	}

}



static void

mlxsw_sp_fib4_entry_type_unset(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_fib4_entry *fib4_entry)

{

	mlxsw_sp_fib_entry_type_unset(mlxsw_sp, &fib4_entry->common);

}



static struct mlxsw_sp_fib4_entry *

mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp,

			   struct mlxsw_sp_fib_node *fib_node,
@@ -6141,7 +6148,7 @@ static void mlxsw_sp_fib4_entry_destroy(struct mlxsw_sp *mlxsw_sp, 
	struct mlxsw_sp_fib_node *fib_node = fib4_entry->common.fib_node;



	fib_info_put(fib4_entry->fi);

	mlxsw_sp_fib4_entry_type_unset(mlxsw_sp, &fib4_entry->common);

	mlxsw_sp_fib4_entry_type_unset(mlxsw_sp, fib4_entry);

	mlxsw_sp_nexthop_group_vr_unlink(fib4_entry->common.nh_group,

					 fib_node->fib);

	mlxsw_sp_nexthop4_group_put(mlxsw_sp, &fib4_entry->common);