Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf95233e authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum: Cosmetic naming change 



Currently the struct representing router interface "mlxsw_sp_rif"
is reffered as "r" in various places in the driver. Furthermore it
contains a member which specify the index which is called "rif".
This patch change "r" to "rif" and "rif" to "rif_index".

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33928eed

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

+4 −4
Original line number Diff line number Diff line
@@ -4088,8 +4088,8 @@ static void mlxsw_sp_master_bridge_vlan_unlink(struct mlxsw_sp *mlxsw_sp, 
	struct mlxsw_sp_fid *f;



	f = mlxsw_sp_fid_find(mlxsw_sp, fid);

	if (f && f->r)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->r);

	if (f && f->rif)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->rif);

	if (f && --f->ref_count == 0)

		mlxsw_sp_fid_destroy(mlxsw_sp, f);

}
@@ -4206,8 +4206,8 @@ static void mlxsw_sp_vfid_destroy(struct mlxsw_sp *mlxsw_sp, 
	clear_bit(vfid, mlxsw_sp->vfids.mapped);

	list_del(&f->list);



	if (f->r)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->r);

	if (f->rif)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->rif);



	kfree(f);

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ struct mlxsw_sp_fid { 
	struct list_head list;

	unsigned int ref_count;

	struct net_device *dev;

	struct mlxsw_sp_rif *r;

	struct mlxsw_sp_rif *rif;

	u16 fid;

};
@@ -577,7 +577,7 @@ int mlxsw_sp_netdevice_router_port_event(struct net_device *dev); 
int mlxsw_sp_inetaddr_event(struct notifier_block *unused,

			    unsigned long event, void *ptr);

void mlxsw_sp_rif_bridge_destroy(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_rif *r);

				 struct mlxsw_sp_rif *rif);

int mlxsw_sp_vport_vrf_join(struct mlxsw_sp_port *mlxsw_sp_vport);

void mlxsw_sp_vport_vrf_leave(struct mlxsw_sp_port *mlxsw_sp_vport);

int mlxsw_sp_port_vrf_join(struct mlxsw_sp_port *mlxsw_sp_port);

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

+144 −138

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ void mlxsw_sp_fid_destroy(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *f) 


	list_del(&f->list);



	if (f->r)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->r);

	if (f->rif)

		mlxsw_sp_rif_bridge_destroy(mlxsw_sp, f->rif);



	kfree(f);