From 162bd820d6cb88091618be83369feb591fc30306 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 20 Oct 2023 21:55:01 +0200
Subject: vxlan: T5671: change port to IANA assigned default port

Currently VyOS VXLAN implementation uses the Linux assigned port 8472 that
predates the IANA assignment. As Most other vendors use the IANA assigned port,
follow this guideline and use the new default port 4789.

Existing configuration not defining an explicit port number will be migrated
to the old default port number of 8472, keeping existing configurations work!

(cherry picked from commit 6db8d3ded19f652b99231be0d705d76b598ac72a)

# Conflicts:
#	interface-definitions/include/version/interfaces-version.xml.i
---
 interface-definitions/include/version/interfaces-version.xml.i | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'interface-definitions/include/version')

diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i
index 3d11ce888..25f158508 100644
--- a/interface-definitions/include/version/interfaces-version.xml.i
+++ b/interface-definitions/include/version/interfaces-version.xml.i
@@ -1,3 +1,7 @@
 <!-- include start from include/version/interfaces-version.xml.i -->
+<<<<<<< HEAD
 <syntaxVersion component='interfaces' version='30'></syntaxVersion>
+=======
+<syntaxVersion component='interfaces' version='32'></syntaxVersion>
+>>>>>>> 6db8d3ded (vxlan: T5671: change port to IANA assigned default port)
 <!-- include end -->
-- 
cgit v1.2.3