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

Commit c5791ab0 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: vxlan.c depends on CONFIG_VXLAN 



When vxlan is not enabled by kernel, no need to enable it in mlx5.
Compile out lib/vxlan.c if CONFIG_VXLAN is not selected.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
parent 44f68ae0

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config MLX5_CORE 
	depends on MAY_USE_DEVLINK

	depends on PCI

	imply PTP_1588_CLOCK

	imply VXLAN

	default n

	---help---

	  Core driver for low level functionality of the ConnectX-4 and

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -13,15 +13,16 @@ mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o accel/tls.o 
mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \

		fpga/ipsec.o fpga/tls.o



mlx5_core-$(CONFIG_MLX5_MPFS)  += lib/mpfs.o

mlx5_core-$(CONFIG_VXLAN) += lib/vxlan.o



mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_selftest.o en/port.o lib/vxlan.o

		en_selftest.o en/port.o



mlx5_core-$(CONFIG_MLX5_EN_ARFS)  += en_arfs.o

mlx5_core-$(CONFIG_MLX5_EN_RXNFC) += en_fs_ethtool.o



mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o



mlx5_core-$(CONFIG_MLX5_ESWITCH) += eswitch.o eswitch_offloads.o en_rep.o en_tc.o



mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o en/port_buffer.o

drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.h

+6 −6
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
struct mlx5_vxlan;

struct mlx5_vxlan_port;



#ifdef CONFIG_MLX5_CORE_EN



static inline bool mlx5_vxlan_allowed(struct mlx5_vxlan *vxlan)

{

	/* not allowed reason is encoded in vxlan pointer as error,
@@ -47,18 +45,20 @@ static inline bool mlx5_vxlan_allowed(struct mlx5_vxlan *vxlan) 
	return !IS_ERR_OR_NULL(vxlan);

}



#if IS_ENABLED(CONFIG_VXLAN)

struct mlx5_vxlan *mlx5_vxlan_create(struct mlx5_core_dev *mdev);

void mlx5_vxlan_destroy(struct mlx5_vxlan *vxlan);

int mlx5_vxlan_add_port(struct mlx5_vxlan *vxlan, u16 port);

int mlx5_vxlan_del_port(struct mlx5_vxlan *vxlan, u16 port);

struct mlx5_vxlan_port *mlx5_vxlan_lookup_port(struct mlx5_vxlan *vxlan, u16 port);



#else



static inline struct mlx5_vxlan*

mlx5_vxlan_create(struct mlx5_core_dev *mdev) { return ERR_PTR(-ENOTSUPP); }

mlx5_vxlan_create(struct mlx5_core_dev *mdev) { return ERR_PTR(-EOPNOTSUPP); }

static inline void mlx5_vxlan_destroy(struct mlx5_vxlan *vxlan) { return; }



static inline int mlx5_vxlan_add_port(struct mlx5_vxlan *vxlan, u16 port) { return -EOPNOTSUPP; }

static inline int mlx5_vxlan_del_port(struct mlx5_vxlan *vxlan, u16 port) { return -EOPNOTSUPP; }

static inline struct mx5_vxlan_port*

mlx5_vxlan_lookup_port(struct mlx5_vxlan *vxlan, u16 port) { return NULL; }

#endif



#endif /* __MLX5_VXLAN_H__ */