* [PATCH] iproute2: Fix usage and man page for 'ip link'
@ 2011-10-06 23:10 Sridhar Samudrala
2011-10-07 18:05 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Sridhar Samudrala @ 2011-10-06 23:10 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Add bridge as a supported type with 'ip link' in usage and all the missing
types in 'ip' man page. Also fixed some typos.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
diff --git a/ip/iplink.c b/ip/iplink.c
index e5325a6..35e6dc6 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -43,7 +43,7 @@ static int iplink_have_newlink(void);
void iplink_usage(void)
{
if (iplink_have_newlink()) {
- fprintf(stderr, "Usage: ip link add link DEV [ name ] NAME\n");
+ fprintf(stderr, "Usage: ip link add [link DEV] [ name ] NAME\n");
fprintf(stderr, " [ txqueuelen PACKETS ]\n");
fprintf(stderr, " [ address LLADDR ]\n");
fprintf(stderr, " [ broadcast LLADDR ]\n");
@@ -78,7 +78,7 @@ void iplink_usage(void)
if (iplink_have_newlink()) {
fprintf(stderr, "\n");
- fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can }\n");
+ fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can | bridge }\n");
}
exit(-1);
}
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index 27993a4..49d94f5 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -47,7 +47,7 @@ ip \- show / manipulate routing, devices, policy routing and tunnels
.ti -8
.IR TYPE " := [ "
-.BR vlan " | " maclan " | " can " ]"
+.BR vlan " | " veth " | " vcan " | " dummy " | " ifb " | " macvlan " | " can " | " bridge ]"
.ti -8
.BI "ip link delete " DEVICE
@@ -989,13 +989,28 @@ Link types:
.in +8
.B vlan
-- 802.1q tagged virrtual LAN interface
+- 802.1q tagged virtual LAN interface
+.sp
+.B veth
+- Virtual ethernet interface
+.sp
+.B vcan
+- Virtual Local CAN interface
+.sp
+.B dummy
+- Dummy network interface
+.sp
+.B ifb
+- Intermediate Functional Block device
.sp
.B macvlan
- virtual interface base on link layer address (MAC)
.sp
.B can
- Controller Area Network interface
+.sp
+.B bridge
+- Ethernet Bridge device
.in -8
.SS ip link delete - delete virtual link
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iproute2: Fix usage and man page for 'ip link'
2011-10-06 23:10 [PATCH] iproute2: Fix usage and man page for 'ip link' Sridhar Samudrala
@ 2011-10-07 18:05 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2011-10-07 18:05 UTC (permalink / raw)
To: Sridhar Samudrala; +Cc: netdev
On Thu, 06 Oct 2011 16:10:51 -0700
Sridhar Samudrala <sri@us.ibm.com> wrote:
> Add bridge as a supported type with 'ip link' in usage and all the missing
> types in 'ip' man page. Also fixed some typos.
>
> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Applied. This manpage is getting huge.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-07 18:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-06 23:10 [PATCH] iproute2: Fix usage and man page for 'ip link' Sridhar Samudrala
2011-10-07 18:05 ` Stephen Hemminger
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).