[ovs-dev,1/5] system-common-macros: add tunnel-args support.

Message ID 1520629345-130136-2-git-send-email-u9012063@gmail.com
State Accepted
Headers show
Series
  • Add ERSPAN userspace support.
Related show

Commit Message

William Tu March 9, 2018, 9:02 p.m.
Add new tunnel-args for creating ipv6 tunnel through iproute2.

Signed-off-by: William Tu <u9012063@gmail.com>
---
 tests/system-common-macros.at | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Ben Pfaff April 5, 2018, 12:10 a.m. | #1
On Fri, Mar 09, 2018 at 01:02:21PM -0800, William Tu wrote:
> Add new tunnel-args for creating ipv6 tunnel through iproute2.
> 
> Signed-off-by: William Tu <u9012063@gmail.com>

Applied to master, thanks!

Patch

diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index f7d4adb947a0..d2a9b59e9684 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -179,12 +179,13 @@  m4_define([ADD_OVS_TUNNEL],
    ]
 )
 
-# ADD_OVS_TUNNEL6([type], [bridge], [port], [remote-addr], [overlay-addr])
+# ADD_OVS_TUNNEL6([type], [bridge], [port], [remote-addr], [overlay-addr],
+#                 [tunnel-args])
 #
 # Same as ADD_OVS_TUNNEL, but drops MTU enough for the IPv6 underlay.
 #
 m4_define([ADD_OVS_TUNNEL6],
-   [ADD_OVS_TUNNEL([$1], [$2], [$3], [$4], [$5])
+   [ADD_OVS_TUNNEL([$1], [$2], [$3], [$4], [$5], [$6])
     AT_CHECK([ip link set dev $2 mtu 1430])
    ]
 )