* [PATCH] iplink: can: fix help text and man page
@ 2014-05-15 17:52 Oliver Hartkopp
0 siblings, 0 replies; only message in thread
From: Oliver Hartkopp @ 2014-05-15 17:52 UTC (permalink / raw)
To: stephen; +Cc: linux-can, netdev, Oliver Hartkopp
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>
---
ip/iplink.c | 4 ++--
man/man8/ip-link.8.in | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ip/iplink.c b/ip/iplink.c
index 0134d6e..c94261a 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 9b555b0..e126046 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
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-05-15 17:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-15 17:52 [PATCH] iplink: can: fix help text and man page Oliver Hartkopp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).