mlxsw: spectrum: Unmap 802.1Q FID before destroying it

idosch · davem330 · commit 8168287b5dfa · 2016-08-17T19:18:27.000-04:00
Before destroying the 802.1Q FID we should first remove the VID-to-FID mapping. This makes mlxsw_sp_fid_destroy() symmetric with regards to mlxsw_sp_fid_create(). Fixes: 14d3946 ("mlxsw: spectrum: Use per-FID struct for the VLAN-aware bridge") Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -450,6 +450,8 @@ void mlxsw_sp_fid_destroy(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *f)
 
 	kfree(f);
 
+	mlxsw_sp_fid_map(mlxsw_sp, fid, false);
+
 	mlxsw_sp_fid_op(mlxsw_sp, fid, false);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,8 @@ void mlxsw_sp_fid_destroy(struct mlxsw_sp mlxsw_sp, struct mlxsw_sp_fid f)`
`450`	`450`
`451`	`451`	`kfree(f);`
`452`	`452`
	`453`	`+ mlxsw_sp_fid_map(mlxsw_sp, fid, false);`
	`454`	`+`
`453`	`455`	`mlxsw_sp_fid_op(mlxsw_sp, fid, false);`
`454`	`456`	`}`
`455`	`457`