Commit 18c4b79d authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Resolve RIF from nexthop struct instead of neighbour 



The two are the same, but for blackhole nexthops we will not have an
associated neighbour struct, so resolve the RIF from the nexthop struct
itself instead.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 919f6aaa

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

+1 −1
Original line number Diff line number Diff line
@@ -3284,7 +3284,7 @@ static int __mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index, 


	mlxsw_reg_ratr_pack(ratr_pl, MLXSW_REG_RATR_OP_WRITE_WRITE_ENTRY,

			    true, MLXSW_REG_RATR_TYPE_ETHERNET,

			    adj_index, neigh_entry->rif);

			    adj_index, nh->rif->rif_index);

	mlxsw_reg_ratr_eth_entry_pack(ratr_pl, neigh_entry->ha);

	if (nh->counter_valid)

		mlxsw_reg_ratr_counter_pack(ratr_pl, nh->counter_index, true);