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

Commit 974eff2b authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net: Move the definition of the default Geneve udp port to public header file 



Move the definition of the default Geneve udp port from the geneve
source to the header file, so we can re-use it from drivers.
Modify existing drivers to use it.

Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Cc: John Hurley <john.hurley@netronome.com>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent bdde9311

drivers/net/ethernet/netronome/nfp/flower/action.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ nfp_fl_get_tun_from_act_l4_port(struct nfp_app *app, 
	switch (tun->key.tp_dst) {

	case htons(NFP_FL_VXLAN_PORT):

		return NFP_FL_TUNNEL_VXLAN;

	case htons(NFP_FL_GENEVE_PORT):

	case htons(GENEVE_UDP_PORT):

		if (priv->flower_ext_feats & NFP_FL_FEATS_GENEVE)

			return NFP_FL_TUNNEL_GENEVE;

		/* FALLTHROUGH */

drivers/net/ethernet/netronome/nfp/flower/main.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct nfp_app; 
#define NFP_FL_MASK_ID_LOCATION		1



#define NFP_FL_VXLAN_PORT		4789

#define NFP_FL_GENEVE_PORT		6081



/* Extra features bitmap. */

#define NFP_FL_FEATS_GENEVE		BIT(0)

drivers/net/ethernet/netronome/nfp/flower/offload.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, 
			if (enc_op.key)

				return -EOPNOTSUPP;

			break;

		case htons(NFP_FL_GENEVE_PORT):

		case htons(GENEVE_UDP_PORT):

			if (!(priv->flower_ext_feats & NFP_FL_FEATS_GENEVE))

				return -EOPNOTSUPP;

			*tun_type = NFP_FL_TUNNEL_GENEVE;

drivers/net/geneve.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 


#define GENEVE_NETDEV_VER	"0.6"



#define GENEVE_UDP_PORT		6081



#define GENEVE_N_VID		(1u << 24)

#define GENEVE_VID_MASK		(GENEVE_N_VID - 1)

include/net/geneve.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#include <net/udp_tunnel.h>



#define GENEVE_UDP_PORT		6081



/* Geneve Header:

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |Ver|  Opt Len  |O|C|    Rsvd.  |          Protocol Type        |