linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port
@ 2021-11-27  9:34 Guangbin Huang
  2021-11-27  9:34 ` [PATCH net-next 1/2] " Guangbin Huang
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Guangbin Huang @ 2021-11-27  9:34 UTC (permalink / raw)
  To: davem, kuba, wangjie125
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2, chenhao288

This series add macro definition for number of IANA VXLAN-GPE port for
cleanup.

Hao Chen (2):
  net: vxlan: add macro definition for number of IANA VXLAN-GPE port
  net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790

 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
 drivers/net/vxlan.c                             | 2 +-
 include/net/vxlan.h                             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

-- 
2.33.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH net-next 1/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port
  2021-11-27  9:34 [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port Guangbin Huang
@ 2021-11-27  9:34 ` Guangbin Huang
  2021-11-27  9:34 ` [PATCH net-next 2/2] net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790 Guangbin Huang
  2021-11-29 12:30 ` [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Guangbin Huang @ 2021-11-27  9:34 UTC (permalink / raw)
  To: davem, kuba, wangjie125
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2, chenhao288

From: Hao Chen <chenhao288@hisilicon.com>

Add macro definition for number of IANA VXLAN-GPE port for generic use.

Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/vxlan.c | 2 +-
 include/net/vxlan.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index fecff0a46612..359d16780dbb 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -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);
 	}
diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 08537aa14f7c..5a934bebe630 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -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:
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH net-next 2/2] net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790
  2021-11-27  9:34 [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port Guangbin Huang
  2021-11-27  9:34 ` [PATCH net-next 1/2] " Guangbin Huang
@ 2021-11-27  9:34 ` Guangbin Huang
  2021-11-29 12:30 ` [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: Guangbin Huang @ 2021-11-27  9:34 UTC (permalink / raw)
  To: davem, kuba, wangjie125
  Cc: netdev, linux-kernel, lipeng321, huangguangbin2, chenhao288

From: Hao Chen <chenhao288@hisilicon.com>

This patch uses macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790 for
cleanup.

Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 496ddf397bd4..3eb2985b9c8d 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -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;
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port
  2021-11-27  9:34 [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port Guangbin Huang
  2021-11-27  9:34 ` [PATCH net-next 1/2] " Guangbin Huang
  2021-11-27  9:34 ` [PATCH net-next 2/2] net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790 Guangbin Huang
@ 2021-11-29 12:30 ` patchwork-bot+netdevbpf
  2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-11-29 12:30 UTC (permalink / raw)
  To: Guangbin Huang
  Cc: davem, kuba, wangjie125, netdev, linux-kernel, lipeng321, chenhao288

Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Sat, 27 Nov 2021 17:34:03 +0800 you wrote:
> This series add macro definition for number of IANA VXLAN-GPE port for
> cleanup.
> 
> Hao Chen (2):
>   net: vxlan: add macro definition for number of IANA VXLAN-GPE port
>   net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port
    https://git.kernel.org/netdev/net-next/c/ed618bd80947
  - [net-next,2/2] net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790
    https://git.kernel.org/netdev/net-next/c/e54b708c5441

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-29 13:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-27  9:34 [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port Guangbin Huang
2021-11-27  9:34 ` [PATCH net-next 1/2] " Guangbin Huang
2021-11-27  9:34 ` [PATCH net-next 2/2] net: hns3: use macro IANA_VXLAN_GPE_UDP_PORT to replace number 4790 Guangbin Huang
2021-11-29 12:30 ` [PATCH net-next 0/2] net: vxlan: add macro definition for number of IANA VXLAN-GPE port patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).