5 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c
index eeda4ed98333..269ddcffa218 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/action.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
@@ -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 */
diff --git a/drivers/net/ethernet/netronome/nfp/flower/main.h b/drivers/net/ethernet/netronome/nfp/flower/main.h
index c0945a5fd1a4..6c27e9b403bc 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/main.h
+++ b/drivers/net/ethernet/netronome/nfp/flower/main.h
@@ -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)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index 450d7296fd57..bdd551f36cb7 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -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;
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 5583d993480d..c05b1207358d 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -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)
 
diff --git a/include/net/geneve.h b/include/net/geneve.h
index fc6a7e0a874a..bced0b1d9fe4 100644
--- a/include/net/geneve.h
+++ b/include/net/geneve.h
@@ -4,6 +4,8 @@
 
 #include <net/udp_tunnel.h>
 
+#define GENEVE_UDP_PORT         6081
+
 /* Geneve Header:
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *  |Ver|  Opt Len  |O|C|    Rsvd.  |          Protocol Type        |