|
 |
049c96 |
From 99bd608a259c2ef0cafdbb96aa38c8e934c63955 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Mon, 7 Mar 2016 20:33:46 +0100
|
|
|
049c96 |
Subject: [PATCH] iplink: fix help text syntax
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1251186
|
|
|
049c96 |
Upstream Status: iproute2.git commit 5c2ea5b8c001f
|
|
|
049c96 |
Conflicts: Missing commit 6c5ffb9a2c3db ("iplink: cleanup whitespace and
|
|
|
049c96 |
checkpatch issues"), which introduces worse conflicts.
|
|
|
049c96 |
Relevant changes therefore incorporated here.
|
|
|
049c96 |
|
|
|
049c96 |
commit 5c2ea5b8c001fe3e7c85f2c93b9b05bcb035bafa
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Wed Mar 2 19:19:51 2016 +0100
|
|
|
049c96 |
|
|
|
049c96 |
iplink: fix help text syntax
|
|
|
049c96 |
|
|
|
049c96 |
Get rid of extraneous closing brackets and while here, merge the double
|
|
|
049c96 |
netns parameter.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/iplink.c | 9 ++++-----
|
|
|
049c96 |
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/iplink.c b/ip/iplink.c
|
|
|
049c96 |
index f444bef..787d743 100644
|
|
|
049c96 |
--- a/ip/iplink.c
|
|
|
049c96 |
+++ b/ip/iplink.c
|
|
|
049c96 |
@@ -70,17 +70,16 @@ void iplink_usage(void)
|
|
|
049c96 |
fprintf(stderr, " [ address LLADDR ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ broadcast LLADDR ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ mtu MTU ]\n");
|
|
|
049c96 |
- fprintf(stderr, " [ netns PID ]\n");
|
|
|
049c96 |
- fprintf(stderr, " [ netns NAME ]\n");
|
|
|
049c96 |
+ fprintf(stderr, " [ netns { PID | NAME } ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ link-netnsid ID ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ alias NAME ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ vf NUM [ mac LLADDR ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ vlan VLANID [ qos VLAN-QOS ] ]\n");
|
|
|
049c96 |
|
|
|
049c96 |
- fprintf(stderr, " [ rate TXRATE ] ] \n");
|
|
|
049c96 |
+ fprintf(stderr, " [ rate TXRATE ]\n");
|
|
|
049c96 |
|
|
|
049c96 |
- fprintf(stderr, " [ spoofchk { on | off} ] ] \n");
|
|
|
049c96 |
- fprintf(stderr, " [ query_rss { on | off} ] ] \n");
|
|
|
049c96 |
+ fprintf(stderr, " [ spoofchk { on | off} ]\n");
|
|
|
049c96 |
+ fprintf(stderr, " [ query_rss { on | off} ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ state { auto | enable | disable} ] ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ master DEVICE ]\n");
|
|
|
049c96 |
fprintf(stderr, " [ nomaster ]\n");
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|