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

mlxsw: spectrum_router: Only provide MAC address for valid nexthops 



The helper returns the MAC address associated with the nexthop. It is
only valid when the nexthop forwards packets and when it is an Ethernet
nexthop. Reflect this in the checks the helper is performing.

This is not an issue because the sole caller of the function only
invokes it for such nexthops.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26df5acc

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

+2 −1
Original line number Diff line number Diff line
@@ -2986,7 +2986,8 @@ bool mlxsw_sp_nexthop_is_forward(const struct mlxsw_sp_nexthop *nh) 


unsigned char *mlxsw_sp_nexthop_ha(struct mlxsw_sp_nexthop *nh)

{

	if (!nh->offloaded)

	if (nh->type != MLXSW_SP_NEXTHOP_TYPE_ETH ||

	    !mlxsw_sp_nexthop_is_forward(nh))

		return NULL;

	return nh->neigh_entry->ha;

}