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

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

Merge branch 'mlxsw-dpipe-fixes' 



Jiri Pirko says:

====================
mlxsw: spectrum: Fix couple of dpipe ipv4 host table bugs

Arkadi Sharshevsky (1):
  mlxsw: spectrum_dpipe: Fix host table dump

Jiri Pirko (1):
  mlxsw: spectrum: compile-in dpipe support only if devlink is enabled
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae0078fc 18fed7e1

drivers/net/ethernet/mellanox/mlxsw/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_switchdev.o spectrum_router.o \

				   spectrum_kvdl.o spectrum_acl_tcam.o \

				   spectrum_acl.o spectrum_flower.o \

				   spectrum_cnt.o spectrum_dpipe.o \

				   spectrum_cnt.o \

				   spectrum_fid.o

mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o

mlxsw_spectrum-$(CONFIG_NET_DEVLINK) += spectrum_dpipe.o

obj-$(CONFIG_MLXSW_MINIMAL)	+= mlxsw_minimal.o

mlxsw_minimal-objs		:= minimal.o

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

+3 −0
Original line number Diff line number Diff line
@@ -516,6 +516,9 @@ mlxsw_sp_dpipe_table_host_entries_get(struct mlxsw_sp *mlxsw_sp, 


		rif_neigh_count = 0;

		mlxsw_sp_rif_neigh_for_each(neigh_entry, rif) {

			if (mlxsw_sp_neigh_entry_type(neigh_entry) != type)

				continue;



			if (rif_neigh_count < rif_neigh_skip)

				goto skip;

drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h

+15 −0
Original line number Diff line number Diff line
@@ -35,9 +35,24 @@ 
#ifndef _MLXSW_PIPELINE_H_

#define _MLXSW_PIPELINE_H_



#if IS_ENABLED(CONFIG_NET_DEVLINK)



int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp);



#else



static inline int mlxsw_sp_dpipe_init(struct mlxsw_sp *mlxsw_sp)

{

	return 0;

}



static inline void mlxsw_sp_dpipe_fini(struct mlxsw_sp *mlxsw_sp)

{

}



#endif



#define MLXSW_SP_DPIPE_TABLE_NAME_ERIF "mlxsw_erif"

#define MLXSW_SP_DPIPE_TABLE_NAME_HOST4 "mlxsw_host4"