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

Commit e58be79e authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Nullify nexthop's neigh pointer 



When we invalidate a nexthop we should also invalidate its neighbour
entry pointer as it might be destroyed later on. This makes the nexthop
de-init function symmetric with its init and also ensures nobody will
try to access the neighbour entry.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b05d0cfa

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

+3 −2
Original line number Diff line number Diff line
@@ -1398,12 +1398,13 @@ static void mlxsw_sp_nexthop_fini(struct mlxsw_sp *mlxsw_sp, 


	__mlxsw_sp_nexthop_neigh_update(nh, true);

	list_del(&nh->neigh_list_node);

	nh->neigh_entry = NULL;



	/* If that is the last nexthop connected to that neigh, remove from

	 * nexthop_neighs_list

	 */

	if (list_empty(&nh->neigh_entry->nexthop_list))

		list_del(&nh->neigh_entry->nexthop_neighs_list_node);

	if (list_empty(&neigh_entry->nexthop_list))

		list_del(&neigh_entry->nexthop_neighs_list_node);



	if (!neigh_entry->connected && list_empty(&neigh_entry->nexthop_list))

		mlxsw_sp_neigh_entry_destroy(mlxsw_sp, neigh_entry);