diff options
| author | thompsa <thompsa@FreeBSD.org> | 2006-12-11 23:46:40 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2006-12-11 23:46:40 +0000 |
| commit | a68b5db0667c09becd1a6c1980cb9eabf075be97 (patch) | |
| tree | f64c9494a36368f4740ab3fbefea5606db6a1f61 /sys/net/if_bridge.c | |
| parent | a3a728eabb31b5ce3771f41c9b9b0bab5dbde992 (diff) | |
| download | FreeBSD-src-a68b5db0667c09becd1a6c1980cb9eabf075be97.zip FreeBSD-src-a68b5db0667c09becd1a6c1980cb9eabf075be97.tar.gz | |
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
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 28d4561..359d7dd 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1020,10 +1020,10 @@ bridge_ioctl_gifflags(struct bridge_softc *sc, void *arg) 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; if (bp->bp_flags & BSTP_PORT_ADMEDGE) req->ifbr_ifsflags |= IFBIF_BSTP_ADMEDGE; if (bp->bp_flags & BSTP_PORT_ADMCOST) @@ -1062,8 +1062,8 @@ bridge_ioctl_sifflags(struct bridge_softc *sc, void *arg) /* Pass on STP flags */ bstp_set_edge(bp, req->ifbr_ifsflags & IFBIF_BSTP_EDGE ? 1 : 0); bstp_set_autoedge(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOEDGE ? 1 : 0); - bstp_set_p2p(bp, req->ifbr_ifsflags & IFBIF_BSTP_P2P ? 1 : 0); - bstp_set_autop2p(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOP2P ? 1 : 0); + bstp_set_ptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_PTP ? 1 : 0); + bstp_set_autoptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOPTP ? 1 : 0); /* Save the bits relating to the bridge */ bif->bif_flags = req->ifbr_ifsflags & IFBIFMASK; |
