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

Commit 0522bab1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Update-firmware-version' 



Jiri Pirko says:

====================
mlxsw: Update firmware version

Ido says:

This set adjusts the driver to use a new firmware version. The new
version includes various enhancements and fixes detailed in the first
patch.

The second patch enables batch deletion of neighbours on a router
interface (RIF) which was not possible with previous versions.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8983487f 63dd00fa

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

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 
#include "../mlxfw/mlxfw.h"



#define MLXSW_FWREV_MAJOR 13

#define MLXSW_FWREV_MINOR 1420

#define MLXSW_FWREV_SUBMINOR 122

#define MLXSW_FWREV_MINOR 1530

#define MLXSW_FWREV_SUBMINOR 152



static const struct mlxsw_fw_rev mlxsw_sp_supported_fw_rev = {

	.major = MLXSW_FWREV_MAJOR,

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

+12 −3
Original line number Diff line number Diff line
@@ -2416,17 +2416,26 @@ static void mlxsw_sp_neigh_fini(struct mlxsw_sp *mlxsw_sp) 
	rhashtable_destroy(&mlxsw_sp->router->neigh_ht);

}



static int mlxsw_sp_neigh_rif_flush(struct mlxsw_sp *mlxsw_sp,

				    const struct mlxsw_sp_rif *rif)

{

	char rauht_pl[MLXSW_REG_RAUHT_LEN];



	mlxsw_reg_rauht_pack(rauht_pl, MLXSW_REG_RAUHT_OP_WRITE_DELETE_ALL,

			     rif->rif_index, rif->addr);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rauht), rauht_pl);

}



static void mlxsw_sp_neigh_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,

					 struct mlxsw_sp_rif *rif)

{

	struct mlxsw_sp_neigh_entry *neigh_entry, *tmp;



	mlxsw_sp_neigh_rif_flush(mlxsw_sp, rif);

	list_for_each_entry_safe(neigh_entry, tmp, &rif->neigh_list,

				 rif_list_node) {

		mlxsw_sp_neigh_entry_update(mlxsw_sp, neigh_entry, false);

				 rif_list_node)

		mlxsw_sp_neigh_entry_destroy(mlxsw_sp, neigh_entry);

}

}



enum mlxsw_sp_nexthop_type {

	MLXSW_SP_NEXTHOP_TYPE_ETH,