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

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
...@@ -163,7 +163,7 @@ nfp_fl_get_tun_from_act_l4_port(struct nfp_app *app, ...@@ -163,7 +163,7 @@ nfp_fl_get_tun_from_act_l4_port(struct nfp_app *app,
switch (tun->key.tp_dst) { switch (tun->key.tp_dst) {
case htons(NFP_FL_VXLAN_PORT): case htons(NFP_FL_VXLAN_PORT):
return NFP_FL_TUNNEL_VXLAN; 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) if (priv->flower_ext_feats & NFP_FL_FEATS_GENEVE)
return NFP_FL_TUNNEL_GENEVE; return NFP_FL_TUNNEL_GENEVE;
/* FALLTHROUGH */ /* FALLTHROUGH */
......
...@@ -35,7 +35,6 @@ struct nfp_app; ...@@ -35,7 +35,6 @@ struct nfp_app;
#define NFP_FL_MASK_ID_LOCATION 1 #define NFP_FL_MASK_ID_LOCATION 1
#define NFP_FL_VXLAN_PORT 4789 #define NFP_FL_VXLAN_PORT 4789
#define NFP_FL_GENEVE_PORT 6081
/* Extra features bitmap. */ /* Extra features bitmap. */
#define NFP_FL_FEATS_GENEVE BIT(0) #define NFP_FL_FEATS_GENEVE BIT(0)
......
...@@ -203,7 +203,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app, ...@@ -203,7 +203,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
if (enc_op.key) if (enc_op.key)
return -EOPNOTSUPP; return -EOPNOTSUPP;
break; break;
case htons(NFP_FL_GENEVE_PORT): case htons(GENEVE_UDP_PORT):
if (!(priv->flower_ext_feats & NFP_FL_FEATS_GENEVE)) if (!(priv->flower_ext_feats & NFP_FL_FEATS_GENEVE))
return -EOPNOTSUPP; return -EOPNOTSUPP;
*tun_type = NFP_FL_TUNNEL_GENEVE; *tun_type = NFP_FL_TUNNEL_GENEVE;
......
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#define GENEVE_NETDEV_VER "0.6" #define GENEVE_NETDEV_VER "0.6"
#define GENEVE_UDP_PORT 6081
#define GENEVE_N_VID (1u << 24) #define GENEVE_N_VID (1u << 24)
#define GENEVE_VID_MASK (GENEVE_N_VID - 1) #define GENEVE_VID_MASK (GENEVE_N_VID - 1)
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <net/udp_tunnel.h> #include <net/udp_tunnel.h>
#define GENEVE_UDP_PORT 6081
/* Geneve Header: /* Geneve Header:
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* |Ver| Opt Len |O|C| Rsvd. | Protocol Type | * |Ver| Opt Len |O|C| Rsvd. | Protocol Type |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment