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

Commit 02d21b59 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_nve: Enable VXLAN on Spectrum-2 



Enable VXLAN on Spectrum-2 as previous patches added the required
functionality.

Note that for now Spectrum-1 and Spectrum-2 use the same function to
determine whether the VXLAN configuration is valid or not. In the
future, when the driver will be extended to support features not present
in Spectrum-1, two different functions will be needed.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ee70efa

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

+5 −12
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#define MLXSW_SP_NVE_VXLAN_SUPPORTED_FLAGS	(VXLAN_F_UDP_ZERO_CSUM_TX | \

#define MLXSW_SP_NVE_VXLAN_SUPPORTED_FLAGS	(VXLAN_F_UDP_ZERO_CSUM_TX | \

						 VXLAN_F_LEARN)

						 VXLAN_F_LEARN)





static bool mlxsw_sp1_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,

static bool mlxsw_sp_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,

					   const struct net_device *dev,

					   const struct net_device *dev,

					   struct netlink_ext_ack *extack)

					   struct netlink_ext_ack *extack)

{

{
@@ -240,7 +240,7 @@ mlxsw_sp_nve_vxlan_clear_offload(const struct net_device *nve_dev, __be32 vni) 




const struct mlxsw_sp_nve_ops mlxsw_sp1_nve_vxlan_ops = {

const struct mlxsw_sp_nve_ops mlxsw_sp1_nve_vxlan_ops = {

	.type		= MLXSW_SP_NVE_TYPE_VXLAN,

	.type		= MLXSW_SP_NVE_TYPE_VXLAN,

	.can_offload	= mlxsw_sp1_nve_vxlan_can_offload,

	.can_offload	= mlxsw_sp_nve_vxlan_can_offload,

	.nve_config	= mlxsw_sp_nve_vxlan_config,

	.nve_config	= mlxsw_sp_nve_vxlan_config,

	.init		= mlxsw_sp1_nve_vxlan_init,

	.init		= mlxsw_sp1_nve_vxlan_init,

	.fini		= mlxsw_sp1_nve_vxlan_fini,

	.fini		= mlxsw_sp1_nve_vxlan_fini,
@@ -248,13 +248,6 @@ const struct mlxsw_sp_nve_ops mlxsw_sp1_nve_vxlan_ops = { 
	.fdb_clear_offload = mlxsw_sp_nve_vxlan_clear_offload,

	.fdb_clear_offload = mlxsw_sp_nve_vxlan_clear_offload,

};

};





static bool mlxsw_sp2_nve_vxlan_can_offload(const struct mlxsw_sp_nve *nve,

					    const struct net_device *dev,

					    struct netlink_ext_ack *extack)

{

	return false;

}



static bool mlxsw_sp2_nve_vxlan_learning_set(struct mlxsw_sp *mlxsw_sp,

static bool mlxsw_sp2_nve_vxlan_learning_set(struct mlxsw_sp *mlxsw_sp,

					     bool learning_en)

					     bool learning_en)

{

{
@@ -374,7 +367,7 @@ static void mlxsw_sp2_nve_vxlan_fini(struct mlxsw_sp_nve *nve) 




const struct mlxsw_sp_nve_ops mlxsw_sp2_nve_vxlan_ops = {

const struct mlxsw_sp_nve_ops mlxsw_sp2_nve_vxlan_ops = {

	.type		= MLXSW_SP_NVE_TYPE_VXLAN,

	.type		= MLXSW_SP_NVE_TYPE_VXLAN,

	.can_offload	= mlxsw_sp2_nve_vxlan_can_offload,

	.can_offload	= mlxsw_sp_nve_vxlan_can_offload,

	.nve_config	= mlxsw_sp_nve_vxlan_config,

	.nve_config	= mlxsw_sp_nve_vxlan_config,

	.init		= mlxsw_sp2_nve_vxlan_init,

	.init		= mlxsw_sp2_nve_vxlan_init,

	.fini		= mlxsw_sp2_nve_vxlan_fini,

	.fini		= mlxsw_sp2_nve_vxlan_fini,