Commit 626b3672 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Remove unused functions 



mlxsw_sp_ipip_lb_ul_vr_id() has been unused since 2020's
commit acde33bf ("mlxsw: spectrum_router: Reduce
mlxsw_sp_ipip_fib_entry_op_gre4()")

mlxsw_sp_rif_exists() has been unused since 2023's
commit 49c3a615 ("mlxsw: spectrum_router: Replay MACVLANs when RIF is
made")

mlxsw_sp_rif_vid() has been unused since 2023's
commit a5b52692 ("mlxsw: spectrum_switchdev: Manage RIFs on PVID
change")

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Link: https://patch.msgid.link/20250203190141.204951-1-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 15c51f17

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+0 −3
Original line number Diff line number Diff line
@@ -754,9 +754,6 @@ void 
mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);

void mlxsw_sp_rif_destroy_by_dev(struct mlxsw_sp *mlxsw_sp,

				 struct net_device *dev);

bool mlxsw_sp_rif_exists(struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev);

u16 mlxsw_sp_rif_vid(struct mlxsw_sp *mlxsw_sp, const struct net_device *dev);

u16 mlxsw_sp_router_port(const struct mlxsw_sp *mlxsw_sp);

int mlxsw_sp_router_nve_promote_decap(struct mlxsw_sp *mlxsw_sp, u32 ul_tb_id,

				      enum mlxsw_sp_l3proto ul_proto,

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

+0 −48
Original line number Diff line number Diff line
@@ -8184,41 +8184,6 @@ mlxsw_sp_rif_find_by_dev(const struct mlxsw_sp *mlxsw_sp, 
	return NULL;

}



bool mlxsw_sp_rif_exists(struct mlxsw_sp *mlxsw_sp,

			 const struct net_device *dev)

{

	struct mlxsw_sp_rif *rif;



	mutex_lock(&mlxsw_sp->router->lock);

	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);

	mutex_unlock(&mlxsw_sp->router->lock);



	return rif;

}



u16 mlxsw_sp_rif_vid(struct mlxsw_sp *mlxsw_sp, const struct net_device *dev)

{

	struct mlxsw_sp_rif *rif;

	u16 vid = 0;



	mutex_lock(&mlxsw_sp->router->lock);

	rif = mlxsw_sp_rif_find_by_dev(mlxsw_sp, dev);

	if (!rif)

		goto out;



	/* We only return the VID for VLAN RIFs. Otherwise we return an

	 * invalid value (0).

	 */

	if (rif->ops->type != MLXSW_SP_RIF_TYPE_VLAN)

		goto out;



	vid = mlxsw_sp_fid_8021q_vid(rif->fid);



out:

	mutex_unlock(&mlxsw_sp->router->lock);

	return vid;

}



static int mlxsw_sp_router_rif_disable(struct mlxsw_sp *mlxsw_sp, u16 rif)

{

	char ritr_pl[MLXSW_REG_RITR_LEN];
@@ -8417,19 +8382,6 @@ u16 mlxsw_sp_ipip_lb_rif_index(const struct mlxsw_sp_rif_ipip_lb *lb_rif) 
	return lb_rif->common.rif_index;

}



u16 mlxsw_sp_ipip_lb_ul_vr_id(const struct mlxsw_sp_rif_ipip_lb *lb_rif)

{

	struct net_device *dev = mlxsw_sp_rif_dev(&lb_rif->common);

	u32 ul_tb_id = mlxsw_sp_ipip_dev_ul_tb_id(dev);

	struct mlxsw_sp_vr *ul_vr;



	ul_vr = mlxsw_sp_vr_get(lb_rif->common.mlxsw_sp, ul_tb_id, NULL);

	if (WARN_ON(IS_ERR(ul_vr)))

		return 0;



	return ul_vr->id;

}



u16 mlxsw_sp_ipip_lb_ul_rif_id(const struct mlxsw_sp_rif_ipip_lb *lb_rif)

{

	return lb_rif->ul_rif_id;

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

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct mlxsw_sp_ipip_entry; 
struct mlxsw_sp_rif *mlxsw_sp_rif_by_index(const struct mlxsw_sp *mlxsw_sp,

					   u16 rif_index);

u16 mlxsw_sp_ipip_lb_rif_index(const struct mlxsw_sp_rif_ipip_lb *rif);

u16 mlxsw_sp_ipip_lb_ul_vr_id(const struct mlxsw_sp_rif_ipip_lb *rif);

u16 mlxsw_sp_ipip_lb_ul_rif_id(const struct mlxsw_sp_rif_ipip_lb *lb_rif);

u32 mlxsw_sp_ipip_dev_ul_tb_id(const struct net_device *ol_dev);

int mlxsw_sp_rif_dev_ifindex(const struct mlxsw_sp_rif *rif);