From: Oliver Hartkopp <socketcan@hartkopp.net>
To: stephen@networkplumber.org
Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org,
Oliver Hartkopp <socketcan@hartkopp.net>
Subject: [PATCH] iplink: can: fix help text and man page
Date: Thu, 15 May 2014 19:52:19 +0200 [thread overview]
Message-ID: <1400176339-2801-1-git-send-email-socketcan@hartkopp.net> (raw)
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
reply other threads:[~2014-05-15 17:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400176339-2801-1-git-send-email-socketcan@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).