These days P2P means peer-2-peer (also well known from serveral filesharing

protocols) while PointToPoint has been PtP links. Change the variables
accordingly while the code is still fresh and undocumented.

Requested by:	bz

2 files changed, 16 insertions, 16 deletions

diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
index a4cf861..4fa6175 100644
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -413,27 +413,27 @@ unsetbridge_autoedge(const char *val, int d, int s, const struct afswtch *afp)
 }
 
 static void
-setbridge_p2p(const char *val, int d, int s, const struct afswtch *afp)
+setbridge_ptp(const char *val, int d, int s, const struct afswtch *afp)
 {
-	do_bridgeflag(s, val, IFBIF_BSTP_P2P, 1);
+	do_bridgeflag(s, val, IFBIF_BSTP_PTP, 1);
 }
 
 static void
-unsetbridge_p2p(const char *val, int d, int s, const struct afswtch *afp)
+unsetbridge_ptp(const char *val, int d, int s, const struct afswtch *afp)
 {
-	do_bridgeflag(s, val, IFBIF_BSTP_P2P, 0);
+	do_bridgeflag(s, val, IFBIF_BSTP_PTP, 0);
 }
 
 static void
-setbridge_autop2p(const char *val, int d, int s, const struct afswtch *afp)
+setbridge_autoptp(const char *val, int d, int s, const struct afswtch *afp)
 {
-	do_bridgeflag(s, val, IFBIF_BSTP_AUTOP2P, 1);
+	do_bridgeflag(s, val, IFBIF_BSTP_AUTOPTP, 1);
 }
 
 static void
-unsetbridge_autop2p(const char *val, int d, int s, const struct afswtch *afp)
+unsetbridge_autoptp(const char *val, int d, int s, const struct afswtch *afp)
 {
-	do_bridgeflag(s, val, IFBIF_BSTP_AUTOP2P, 0);
+	do_bridgeflag(s, val, IFBIF_BSTP_AUTOPTP, 0);
 }
 
 static void
@@ -681,10 +681,10 @@ static struct cmd bridge_cmds[] = {
 	DEF_CMD_ARG("-edge",		unsetbridge_edge),
 	DEF_CMD_ARG("autoedge",		setbridge_autoedge),
 	DEF_CMD_ARG("-autoedge",	unsetbridge_autoedge),
-	DEF_CMD_ARG("p2p",		setbridge_p2p),
-	DEF_CMD_ARG("-p2p",		unsetbridge_p2p),
-	DEF_CMD_ARG("autop2p",		setbridge_autop2p),
-	DEF_CMD_ARG("-autop2p",		unsetbridge_autop2p),
+	DEF_CMD_ARG("ptp",		setbridge_ptp),
+	DEF_CMD_ARG("-ptp",		unsetbridge_ptp),
+	DEF_CMD_ARG("autoptp",		setbridge_autoptp),
+	DEF_CMD_ARG("-autoptp",		unsetbridge_autoptp),
 	DEF_CMD("flush", 0,		setbridge_flush),
 	DEF_CMD("flushall", 0,		setbridge_flushall),
 	DEF_CMD_ARG2("static",		setbridge_static),
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 39969c4..7309965 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1296,24 +1296,24 @@ This is the default for all interfaces added to a bridge.
 .It Cm -autoedge Ar interface
 Disable automatic edge status on 
 .Ar interface .
-.It Cm p2p Ar interface
+.It Cm ptp Ar interface
 Set the
 .Ar interface
 as a point to point link.
 This is required for straight transitions to forwarding and
 should be enabled on a direct link to another RSTP capable switch.
-.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 .
 .It Cm maxage Ar seconds