Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Moshe Shemesh <moshe@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Cc: John Hurley <john.hurley@netronome.com>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

authored by

Moshe Shemesh and committed by
Saeed Mahameed
974eff2b bdde9311

+4 -5
+1 -1
drivers/net/ethernet/netronome/nfp/flower/action.c
··· 163 163 switch (tun->key.tp_dst) { 164 164 case htons(NFP_FL_VXLAN_PORT): 165 165 return NFP_FL_TUNNEL_VXLAN; 166 - case htons(NFP_FL_GENEVE_PORT): 166 + case htons(GENEVE_UDP_PORT): 167 167 if (priv->flower_ext_feats & NFP_FL_FEATS_GENEVE) 168 168 return NFP_FL_TUNNEL_GENEVE; 169 169 /* FALLTHROUGH */
-1
drivers/net/ethernet/netronome/nfp/flower/main.h
··· 35 35 #define NFP_FL_MASK_ID_LOCATION 1 36 36 37 37 #define NFP_FL_VXLAN_PORT 4789 38 - #define NFP_FL_GENEVE_PORT 6081 39 38 40 39 /* Extra features bitmap. */ 41 40 #define NFP_FL_FEATS_GENEVE BIT(0)
+1 -1
drivers/net/ethernet/netronome/nfp/flower/offload.c
··· 203 203 if (enc_op.key) 204 204 return -EOPNOTSUPP; 205 205 break; 206 - case htons(NFP_FL_GENEVE_PORT): 206 + case htons(GENEVE_UDP_PORT): 207 207 if (!(priv->flower_ext_feats & NFP_FL_FEATS_GENEVE)) 208 208 return -EOPNOTSUPP; 209 209 *tun_type = NFP_FL_TUNNEL_GENEVE;
-2
drivers/net/geneve.c
··· 22 22 23 23 #define GENEVE_NETDEV_VER "0.6" 24 24 25 - #define GENEVE_UDP_PORT 6081 26 - 27 25 #define GENEVE_N_VID (1u << 24) 28 26 #define GENEVE_VID_MASK (GENEVE_N_VID - 1) 29 27
+2
include/net/geneve.h
··· 4 4 5 5 #include <net/udp_tunnel.h> 6 6 7 + #define GENEVE_UDP_PORT 6081 8 + 7 9 /* Geneve Header: 8 10 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 9 11 * |Ver| Opt Len |O|C| Rsvd. | Protocol Type |