|
 |
049c96 |
From 00739d4e137e1a8aa637666ba0c6dbfdb308fcc2 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 20 Jul 2016 22:56:33 +0200
|
|
|
049c96 |
Subject: [PATCH] vxlan: fix help and man text
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit 5cd64c979f97a
|
|
|
049c96 |
|
|
|
049c96 |
commit 5cd64c979f97ac1590e7bf28ae9b1adbd7673d3a
|
|
|
049c96 |
Author: Thomas Faivre <thomas.faivre@6wind.com>
|
|
|
049c96 |
Date: Thu Jan 14 18:10:19 2016 +0100
|
|
|
049c96 |
|
|
|
049c96 |
vxlan: fix help and man text
|
|
|
049c96 |
|
|
|
049c96 |
Options 'group' and 'remote' cannot take 'any' as value but 'local' can.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Thomas Faivre <thomas.faivre@6wind.com>
|
|
|
049c96 |
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/iplink_vxlan.c | 2 +-
|
|
|
049c96 |
man/man8/ip-link.8.in | 3 ++-
|
|
|
049c96 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
|
|
|
049c96 |
index 2ca97a4..015d7d9 100644
|
|
|
049c96 |
--- a/ip/iplink_vxlan.c
|
|
|
049c96 |
+++ b/ip/iplink_vxlan.c
|
|
|
049c96 |
@@ -23,7 +23,7 @@
|
|
|
049c96 |
|
|
|
049c96 |
static void print_explain(FILE *f)
|
|
|
049c96 |
{
|
|
|
049c96 |
- fprintf(f, "Usage: ... vxlan id VNI [ { group | remote } ADDR ] [ local ADDR ]\n");
|
|
|
049c96 |
+ fprintf(f, "Usage: ... vxlan id VNI [ { group | remote } IP_ADDRESS ] [ local ADDR ]\n");
|
|
|
049c96 |
fprintf(f, " [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
|
|
|
049c96 |
fprintf(f, " [ dstport PORT ] [ srcport MIN MAX ]\n");
|
|
|
049c96 |
fprintf(f, " [ [no]learning ] [ [no]proxy ] [ [no]rsc ]\n");
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index b764019..3ee1ad6 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -333,7 +333,8 @@ the following additional arguments are supported:
|
|
|
049c96 |
.RB " ] [ { " group " | " remote " } "
|
|
|
049c96 |
.I IPADDR
|
|
|
049c96 |
.R " ] [ "
|
|
|
049c96 |
-.BI local " IPADDR "
|
|
|
049c96 |
+.B local
|
|
|
049c96 |
+.RI "{ "IPADDR " | "any " } "
|
|
|
049c96 |
.R " ] [ "
|
|
|
049c96 |
.BI ttl " TTL "
|
|
|
049c96 |
.R " ] [ "
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|