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

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

mlxsw: spectrum_router: Remove redundant check 



We only add neighbour entries that are also used for nexthops to
'nexthop_neighs_list', so when iterating over this list there's no need
to check that the entry is indeed used for nexthops.

Remove the redundant check.

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 a8eca326

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

+4 −8
Original line number Diff line number Diff line
@@ -847,13 +847,11 @@ static void mlxsw_sp_router_neighs_update_nh(struct mlxsw_sp *mlxsw_sp) 
	/* Take RTNL mutex here to prevent lists from changes */

	rtnl_lock();

	list_for_each_entry(neigh_entry, &mlxsw_sp->router.nexthop_neighs_list,

			    nexthop_neighs_list_node) {

			    nexthop_neighs_list_node)

		/* If this neigh have nexthops, make the kernel think this neigh

		 * is active regardless of the traffic.

		 */

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

		neigh_event_send(neigh_entry->key.n, NULL);

	}

	rtnl_unlock();

}
@@ -897,11 +895,9 @@ static void mlxsw_sp_router_probe_unresolved_nexthops(struct work_struct *work) 
	 */

	rtnl_lock();

	list_for_each_entry(neigh_entry, &mlxsw_sp->router.nexthop_neighs_list,

			    nexthop_neighs_list_node) {

		if (!(neigh_entry->key.n->nud_state & NUD_VALID) &&

		    !list_empty(&neigh_entry->nexthop_list))

			    nexthop_neighs_list_node)

		if (!(neigh_entry->key.n->nud_state & NUD_VALID))

			neigh_event_send(neigh_entry->key.n, NULL);

	}

	rtnl_unlock();



	mlxsw_core_schedule_dw(&mlxsw_sp->router.nexthop_probe_dw,