diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2006-12-11 22:11:49 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2006-12-11 22:11:49 +0000 |
| commit | f080cb987a578cdd447c3abd1e3772eadb52355e (patch) | |
| tree | 4cfeff4f33db4dce939b0eb85e065c61bc277dcb /sys/net/if_bridge.c | |
| parent | 563d0cc19e8b0619743d67345e382167d55bc926 (diff) | |
refer to the RSTP point to point option as "PTP" instead of "P2P".
P2P is commonly used in relation to peer to peer networks, PTP is used
in various protocols for layer 2 point to point links (ie., full
duplex ethernet links).
note that the newly added brconfig commands [-]p2p and [-]autop2p will
change to [-]ptp and [-]autoptp.
suggested by Andrew Thompson (thompsa@freebsd.org)
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index b92d931210f..3fc842b8c5e 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.154 2006/12/03 13:41:19 reyk Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.155 2006/12/11 22:11:48 reyk Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -503,10 +503,10 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) req->ifbr_ifsflags |= IFBIF_BSTP_EDGE; if (bp->bp_flags & BSTP_PORT_AUTOEDGE) req->ifbr_ifsflags |= IFBIF_BSTP_AUTOEDGE; - if (bp->bp_p2p_link) - req->ifbr_ifsflags |= IFBIF_BSTP_P2P; - if (bp->bp_flags & BSTP_PORT_AUTOP2P) - req->ifbr_ifsflags |= IFBIF_BSTP_AUTOP2P; + if (bp->bp_ptp_link) + req->ifbr_ifsflags |= IFBIF_BSTP_PTP; + if (bp->bp_flags & BSTP_PORT_AUTOPTP) + req->ifbr_ifsflags |= IFBIF_BSTP_AUTOPTP; } break; case SIOCBRDGSIFFLGS: @@ -836,10 +836,10 @@ bridge_bifconf(struct bridge_softc *sc, struct ifbifconf *bifc) breq->ifbr_ifsflags |= IFBIF_BSTP_EDGE; if (bp->bp_flags & BSTP_PORT_AUTOEDGE) breq->ifbr_ifsflags |= IFBIF_BSTP_AUTOEDGE; - if (bp->bp_p2p_link) - breq->ifbr_ifsflags |= IFBIF_BSTP_P2P; - if (bp->bp_flags & BSTP_PORT_AUTOP2P) - breq->ifbr_ifsflags |= IFBIF_BSTP_AUTOP2P; + if (bp->bp_ptp_link) + breq->ifbr_ifsflags |= IFBIF_BSTP_PTP; + if (bp->bp_flags & BSTP_PORT_AUTOPTP) + breq->ifbr_ifsflags |= IFBIF_BSTP_AUTOPTP; } error = copyout((caddr_t)breq, (caddr_t)(bifc->ifbic_req + i), sizeof(*breq)); |