mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-04 12:13:43 +00:00
Merge branch 'vxlan-port'
Guangbin Huang says: ==================== net: vxlan: add macro definition for number of IANA VXLAN-GPE port This series add macro definition for number of IANA VXLAN-GPE port for cleanup. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
fc1e5a3613
@ -1302,7 +1302,7 @@ static bool hns3_tunnel_csum_bug(struct sk_buff *skb)
|
||||
if (!(!skb->encapsulation &&
|
||||
(l4.udp->dest == htons(IANA_VXLAN_UDP_PORT) ||
|
||||
l4.udp->dest == htons(GENEVE_UDP_PORT) ||
|
||||
l4.udp->dest == htons(4790))))
|
||||
l4.udp->dest == htons(IANA_VXLAN_GPE_UDP_PORT))))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
@ -3747,7 +3747,7 @@ static int vxlan_config_validate(struct net *src_net, struct vxlan_config *conf,
|
||||
|
||||
if (!conf->dst_port) {
|
||||
if (conf->flags & VXLAN_F_GPE)
|
||||
conf->dst_port = htons(4790); /* IANA VXLAN-GPE port */
|
||||
conf->dst_port = htons(IANA_VXLAN_GPE_UDP_PORT);
|
||||
else
|
||||
conf->dst_port = htons(vxlan_port);
|
||||
}
|
||||
|
@ -10,6 +10,7 @@
|
||||
#include <net/nexthop.h>
|
||||
|
||||
#define IANA_VXLAN_UDP_PORT 4789
|
||||
#define IANA_VXLAN_GPE_UDP_PORT 4790
|
||||
|
||||
/* VXLAN protocol (RFC 7348) header:
|
||||
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|
Loading…
Reference in New Issue
Block a user