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

Commit 0ed48440 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-cleanups' 



Jiri Pirko says:

====================
mlxsw: small driver update

Contains two cleanup patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 33928eed abbdf4bd

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

+5 −5
Original line number Diff line number Diff line
@@ -1423,7 +1423,7 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, u32 handle, 
						       tc->cls_mall);

			return 0;

		default:

			return -EINVAL;

			return -EOPNOTSUPP;

		}

	case TC_SETUP_CLSFLOWER:

		switch (tc->cls_flower->command) {
@@ -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);