net: Add IANA_VXLAN_UDP_PORT definition to vxlan header file
Added IANA_VXLAN_UDP_PORT (4789) definition to vxlan header file so it can be used by drivers instead of local definition. Updated drivers which locally defined it as 4789 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> Cc: Yunsheng Lin <linyunsheng@huawei.com> Cc: Peng Li <lipeng321@huawei.com> Reviewed-by: Tariq Toukan <tariqt@mellanox.com> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Родитель
e3cfc7e6b7
Коммит
bea964107f
|
@ -826,12 +826,12 @@ static void hns3_set_l2l3l4_len(struct sk_buff *skb, u8 ol4_proto,
|
|||
*/
|
||||
static bool hns3_tunnel_csum_bug(struct sk_buff *skb)
|
||||
{
|
||||
#define IANA_VXLAN_PORT 4789
|
||||
union l4_hdr_info l4;
|
||||
|
||||
l4.hdr = skb_transport_header(skb);
|
||||
|
||||
if (!(!skb->encapsulation && l4.udp->dest == htons(IANA_VXLAN_PORT)))
|
||||
if (!(!skb->encapsulation &&
|
||||
l4.udp->dest == htons(IANA_VXLAN_UDP_PORT)))
|
||||
return false;
|
||||
|
||||
skb_checksum_help(skb);
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mlx5/driver.h>
|
||||
#include <net/vxlan.h>
|
||||
#include "mlx5_core.h"
|
||||
#include "vxlan.h"
|
||||
|
||||
|
@ -204,8 +205,8 @@ struct mlx5_vxlan *mlx5_vxlan_create(struct mlx5_core_dev *mdev)
|
|||
spin_lock_init(&vxlan->lock);
|
||||
hash_init(vxlan->htable);
|
||||
|
||||
/* Hardware adds 4789 by default */
|
||||
mlx5_vxlan_add_port(vxlan, 4789);
|
||||
/* Hardware adds 4789 (IANA_VXLAN_UDP_PORT) by default */
|
||||
mlx5_vxlan_add_port(vxlan, IANA_VXLAN_UDP_PORT);
|
||||
|
||||
return vxlan;
|
||||
}
|
||||
|
|
|
@ -161,7 +161,7 @@ nfp_fl_get_tun_from_act_l4_port(struct nfp_app *app,
|
|||
struct nfp_flower_priv *priv = app->priv;
|
||||
|
||||
switch (tun->key.tp_dst) {
|
||||
case htons(NFP_FL_VXLAN_PORT):
|
||||
case htons(IANA_VXLAN_UDP_PORT):
|
||||
return NFP_FL_TUNNEL_VXLAN;
|
||||
case htons(GENEVE_UDP_PORT):
|
||||
if (priv->flower_ext_feats & NFP_FL_FEATS_GENEVE)
|
||||
|
|
|
@ -34,8 +34,6 @@ struct nfp_app;
|
|||
#define NFP_FL_MASK_REUSE_TIME_NS 40000
|
||||
#define NFP_FL_MASK_ID_LOCATION 1
|
||||
|
||||
#define NFP_FL_VXLAN_PORT 4789
|
||||
|
||||
/* Extra features bitmap. */
|
||||
#define NFP_FL_FEATS_GENEVE BIT(0)
|
||||
#define NFP_FL_NBI_MTU_SETTING BIT(1)
|
||||
|
|
|
@ -195,7 +195,7 @@ nfp_flower_calculate_key_layers(struct nfp_app *app,
|
|||
flow_rule_match_enc_opts(rule, &enc_op);
|
||||
|
||||
switch (enc_ports.key->dst) {
|
||||
case htons(NFP_FL_VXLAN_PORT):
|
||||
case htons(IANA_VXLAN_UDP_PORT):
|
||||
*tun_type = NFP_FL_TUNNEL_VXLAN;
|
||||
key_layer |= NFP_FLOWER_LAYER_VXLAN;
|
||||
key_size += sizeof(struct nfp_flower_ipv4_udp_tun);
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
#include <net/rtnetlink.h>
|
||||
#include <net/switchdev.h>
|
||||
|
||||
#define IANA_VXLAN_UDP_PORT 4789
|
||||
|
||||
/* VXLAN protocol (RFC 7348) header:
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
* |R|R|R|R|I|R|R|R| Reserved |
|
||||
|
|
Загрузка…
Ссылка в новой задаче