|
 |
049c96 |
From fe40921238c1acaa322de13c7fd3ebb0cb8f2c9c Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Tue, 23 Feb 2016 18:26:25 +0100
|
|
|
049c96 |
Subject: [PATCH] iplink: can: fix help text and man page
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit 2b70fe156b719
|
|
|
049c96 |
|
|
|
049c96 |
commit 2b70fe156b7198ee1cbe34610025c3a86461ed02
|
|
|
049c96 |
Author: Oliver Hartkopp <socketcan@hartkopp.net>
|
|
|
049c96 |
Date: Thu May 15 19:52:19 2014 +0200
|
|
|
049c96 |
|
|
|
049c96 |
iplink: can: fix help text and man page
|
|
|
049c96 |
|
|
|
049c96 |
Controller Area Network (CAN) interfaces are physical network interfaces.
|
|
|
049c96 |
They can't be 'created' like software devices by 'ip link add type can'.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/iplink.c | 4 ++--
|
|
|
049c96 |
man/man8/ip-link.8.in | 5 +----
|
|
|
049c96 |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/iplink.c b/ip/iplink.c
|
|
|
049c96 |
index 8d6a2b3..7e6d992 100644
|
|
|
049c96 |
--- a/ip/iplink.c
|
|
|
049c96 |
+++ b/ip/iplink.c
|
|
|
049c96 |
@@ -91,8 +91,8 @@ void iplink_usage(void)
|
|
|
049c96 |
fprintf(stderr, " ip link help [ TYPE ]\n");
|
|
|
049c96 |
fprintf(stderr, "\n");
|
|
|
049c96 |
fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
|
|
|
049c96 |
- fprintf(stderr, " can | bridge | bond | ipoib | ip6tnl | ipip | sit |\n");
|
|
|
049c96 |
- fprintf(stderr, " vxlan | gre | gretap | ip6gre | ip6gretap | vti }\n");
|
|
|
049c96 |
+ fprintf(stderr, " bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
|
|
|
049c96 |
+ fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti }\n");
|
|
|
049c96 |
}
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index d69c930..82ae316 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -164,9 +164,6 @@ Link types:
|
|
|
049c96 |
.B bond
|
|
|
049c96 |
- Bonding device
|
|
|
049c96 |
.sp
|
|
|
049c96 |
-.B can
|
|
|
049c96 |
-- Controller Area Network interface
|
|
|
049c96 |
-.sp
|
|
|
049c96 |
.B dummy
|
|
|
049c96 |
- Dummy network interface
|
|
|
049c96 |
.sp
|
|
|
049c96 |
@@ -180,7 +177,7 @@ Link types:
|
|
|
049c96 |
- Virtual interface base on link layer address (MAC)
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.B vcan
|
|
|
049c96 |
-- Virtual Local CAN interface
|
|
|
049c96 |
+- Virtual Controller Area Network interface
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.B veth
|
|
|
049c96 |
- Virtual ethernet interface
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|