Commit 0255f748 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: Convert RIF-has-netdevice queries to a dedicated helper 



In a number of places, a netdevice underlying a RIF is obtained only to
check if it a NULL pointer. In order to clean up the interface between the
router and the other modules, add a new helper to specifically answer this
question, and convert the relevant uses to this new interface.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 151b89f6

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

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ mlxsw_sp_dpipe_table_erif_entries_dump(void *priv, bool counters_enabled, 
	for (; i < rif_count; i++) {

		struct mlxsw_sp_rif *rif = mlxsw_sp_rif_by_index(mlxsw_sp, i);



		if (!rif || !mlxsw_sp_rif_dev(rif))

		if (!rif || !mlxsw_sp_rif_has_dev(rif))

			continue;

		err = mlxsw_sp_erif_entry_get(mlxsw_sp, &entry, rif,

					      counters_enabled);

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

+3 −3
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ int mlxsw_sp_mr_rif_add(struct mlxsw_sp_mr_table *mr_table, 
	const struct net_device *rif_dev = mlxsw_sp_rif_dev(rif);

	struct mlxsw_sp_mr_vif *mr_vif;



	if (!rif_dev)

	if (!mlxsw_sp_rif_has_dev(rif))

		return 0;



	mr_vif = mlxsw_sp_mr_dev_vif_lookup(mr_table, rif_dev);
@@ -736,7 +736,7 @@ void mlxsw_sp_mr_rif_del(struct mlxsw_sp_mr_table *mr_table, 
	const struct net_device *rif_dev = mlxsw_sp_rif_dev(rif);

	struct mlxsw_sp_mr_vif *mr_vif;



	if (!rif_dev)

	if (!mlxsw_sp_rif_has_dev(rif))

		return;



	mr_vif = mlxsw_sp_mr_dev_vif_lookup(mr_table, rif_dev);
@@ -754,7 +754,7 @@ void mlxsw_sp_mr_rif_mtu_update(struct mlxsw_sp_mr_table *mr_table, 
	struct mlxsw_sp_mr *mr = mlxsw_sp->mr;

	struct mlxsw_sp_mr_vif *mr_vif;



	if (!rif_dev)

	if (!mlxsw_sp_rif_has_dev(rif))

		return;



	/* Search for a VIF that use that RIF */

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

+5 −0
Original line number Diff line number Diff line
@@ -8080,6 +8080,11 @@ const struct net_device *mlxsw_sp_rif_dev(const struct mlxsw_sp_rif *rif) 
	return rif->dev;

}



bool mlxsw_sp_rif_has_dev(const struct mlxsw_sp_rif *rif)

{

	return !!mlxsw_sp_rif_dev(rif);

}



static void mlxsw_sp_rif_push_l3_stats(struct mlxsw_sp_rif *rif)

{

	struct rtnl_hw_stats64 stats = {};

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 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);

const struct net_device *mlxsw_sp_rif_dev(const struct mlxsw_sp_rif *rif);

bool mlxsw_sp_rif_has_dev(const struct mlxsw_sp_rif *rif);

int mlxsw_sp_rif_counter_value_get(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_rif *rif,

				   enum mlxsw_sp_rif_counter_dir dir,