diff options
Diffstat (limited to 'sbin/brconfig')
| -rw-r--r-- | sbin/brconfig/brconfig.8 | 10 | ||||
| -rw-r--r-- | sbin/brconfig/brconfig.c | 28 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sbin/brconfig/brconfig.8 b/sbin/brconfig/brconfig.8 index 68918ffbfd4..0f8688980a2 100644 --- a/sbin/brconfig/brconfig.8 +++ b/sbin/brconfig/brconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: brconfig.8,v 1.61 2006/12/07 10:22:05 jmc Exp $ +.\" $OpenBSD: brconfig.8,v 1.62 2006/12/11 22:11:48 reyk Exp $ .\" .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -296,7 +296,7 @@ This is the default for interfaces added to the bridge. .It Cm -autoedge Ar interface Disable automatic spanning tree edge port detection on .Ar interface . -.It Cm p2p Ar interface +.It Cm ptp Ar interface Set the .Ar interface as a point to point link. @@ -304,18 +304,18 @@ This is required for straight transitions to forwarding and should be enabled for a full duplex link or a .Xr trunk 4 with at least two physical links to the same network segment. -.It Cm -p2p Ar interface +.It Cm -ptp Ar interface Disable point to point link status on .Ar interface . This should be disabled for a half duplex link and for an interface connected to a shared network segment, like a hub or a wireless network. -.It Cm autop2p Ar interface +.It Cm autoptp Ar interface Automatically detect the point to point status on .Ar interface by checking the full duplex link status. This is the default for interfaces added to the bridge. -.It Cm -autop2p Ar interface +.It Cm -autoptp Ar interface Disable automatic point to point link detection on .Ar interface . .El diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c index 4fffc195ffb..39c9d338226 100644 --- a/sbin/brconfig/brconfig.c +++ b/sbin/brconfig/brconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.c,v 1.38 2006/12/03 13:41:19 reyk Exp $ */ +/* $OpenBSD: brconfig.c,v 1.39 2006/12/11 22:11:48 reyk Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -93,7 +93,7 @@ int Aflag = 0; #define IFBAFBITS "\020\1STATIC" #define IFBIFBITS \ -"\020\1LEARNING\2DISCOVER\3BLOCKNONIP\4STP\5EDGE\6AUTOEDGE\7P2P\10AUTOP2P\11SPAN" +"\020\1LEARNING\2DISCOVER\3BLOCKNONIP\4STP\5EDGE\6AUTOEDGE\7PTP\10AUTOPTP\11SPAN" #define PV2ID(pv, epri, eaddr) do { \ epri = pv >> 48; \ @@ -530,44 +530,44 @@ main(int argc, char *argv[]) IFBIF_BSTP_AUTOEDGE); if (error) return (error); - } else if (strcmp("p2p", argv[0]) == 0) { + } else if (strcmp("ptp", argv[0]) == 0) { argc--; argv++; if (argc == 0) { - warnx("p2p requires an argument"); + warnx("ptp requires an argument"); return (EX_USAGE); } error = bridge_ifsetflag(sock, brdg, argv[0], - IFBIF_BSTP_P2P); + IFBIF_BSTP_PTP); if (error) return (error); - } else if (strcmp("-p2p", argv[0]) == 0) { + } else if (strcmp("-ptp", argv[0]) == 0) { argc--; argv++; if (argc == 0) { - warnx("-p2p requires an argument"); + warnx("-ptp requires an argument"); return (EX_USAGE); } error = bridge_ifclrflag(sock, brdg, argv[0], - IFBIF_BSTP_P2P); + IFBIF_BSTP_PTP); if (error) return (error); - } else if (strcmp("autop2p", argv[0]) == 0) { + } else if (strcmp("autoptp", argv[0]) == 0) { argc--; argv++; if (argc == 0) { - warnx("autop2p requires an argument"); + warnx("autoptp requires an argument"); return (EX_USAGE); } error = bridge_ifsetflag(sock, brdg, argv[0], - IFBIF_BSTP_AUTOP2P); + IFBIF_BSTP_AUTOPTP); if (error) return (error); - } else if (strcmp("-autop2p", argv[0]) == 0) { + } else if (strcmp("-autoptp", argv[0]) == 0) { argc--; argv++; if (argc == 0) { - warnx("-autop2p requires an argument"); + warnx("-autoptp requires an argument"); return (EX_USAGE); } error = bridge_ifclrflag(sock, brdg, argv[0], - IFBIF_BSTP_P2P); + IFBIF_BSTP_PTP); if (error) return (error); } else if (strcmp("holdcnt", argv[0]) == 0) { |