mlxsw: spectrum: Assume CONFIG_NET_DEVLINK is always enabled
Since commit f6b19b354d
("net: devlink: select NET_DEVLINK
from drivers") adds implicit select of NET_DEVLINK for
mlxsw, the code does not have to deal with the case
when CONFIG_NET_DEVLINK is not enabled. So remove the ifcase
and adjust Makefile.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
42e5425aa0
commit
0a9798c123
|
@ -28,8 +28,8 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \
|
|||
spectrum1_mr_tcam.o spectrum2_mr_tcam.o \
|
||||
spectrum_mr_tcam.o spectrum_mr.o \
|
||||
spectrum_qdisc.o spectrum_span.o \
|
||||
spectrum_nve.o spectrum_nve_vxlan.o
|
||||
spectrum_nve.o spectrum_nve_vxlan.o \
|
||||
spectrum_dpipe.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
|
||||
|
|
|
@ -4,24 +4,9 @@
|
|||
#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"
|
||||
#define MLXSW_SP_DPIPE_TABLE_NAME_HOST6 "mlxsw_host6"
|
||||
|
|
Loading…
Reference in New Issue