From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Thu, 15 May 2014 17:52:19 +0000 (+0200)
Subject: iplink: can: fix help text and man page
X-Git-Tag: v3.15.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b70fe156b7198ee1cbe34610025c3a86461ed02;p=thirdparty%2Fiproute2.git

iplink: can: fix help text and man page

Controller Area Network (CAN) interfaces are physical network interfaces.
They can't be 'created' like software devices by 'ip link add type can'.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---

diff --git a/ip/iplink.c b/ip/iplink.c
index 0134d6edd..c94261ac5 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -86,8 +86,8 @@ void iplink_usage(void)
 	if (iplink_have_newlink()) {
 		fprintf(stderr, "\n");
 		fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
-		fprintf(stderr, "          can | bridge | bond | ipoib | ip6tnl | ipip | sit |\n");
-		fprintf(stderr, "          vxlan | gre | gretap | ip6gre | ip6gretap | vti }\n");
+		fprintf(stderr, "          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
+		fprintf(stderr, "          gre | gretap | ip6gre | ip6gretap | vti }\n");
 	}
 	exit(-1);
 }
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 9b555b014..e12604695 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -163,9 +163,6 @@ Link types:
 .B bond
 - Bonding device
 .sp
-.B can
-- Controller Area Network interface
-.sp
 .B dummy
 - Dummy network interface
 .sp
@@ -179,7 +176,7 @@ Link types:
 - Virtual interface base on link layer address (MAC)
 .sp
 .B vcan
-- Virtual Local CAN interface
+- Virtual Controller Area Network interface
 .sp
 .B veth
 - Virtual ethernet interface