diff options
| author | brooks <brooks@FreeBSD.org> | 2003-10-31 18:32:15 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2003-10-31 18:32:15 +0000 |
| commit | f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda (patch) | |
| tree | 4d9e6671d486576767506230a4240131526fea49 /sys/net/if_ppp.c | |
| parent | be546fdee455a96afdefee10d0bdba8547399f5b (diff) | |
| download | FreeBSD-src-f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda.zip FreeBSD-src-f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda.tar.gz | |
Replace the if_name and if_unit members of struct ifnet with new members
if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.
This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.
Approved By: re (in principle)
Reviewed By: njl, imp
Tested On: i386, amd64, sparc64
Obtained From: NetBSD (if_xname)
Diffstat (limited to 'sys/net/if_ppp.c')
| -rw-r--r-- | sys/net/if_ppp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index b3dfccb..9480d92 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -201,8 +201,7 @@ ppp_clone_create(struct if_clone *ifc, int unit) sc = malloc(sizeof(struct ppp_softc), M_PPP, M_WAITOK | M_ZERO); sc->sc_if.if_softc = sc; - sc->sc_if.if_name = PPPNAME; - sc->sc_if.if_unit = unit; + if_initname(&sc->sc_if, ifc->ifc_name, unit); sc->sc_if.if_mtu = PPP_MTU; sc->sc_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST; sc->sc_if.if_type = IFT_PPP; @@ -414,7 +413,7 @@ pppioctl(sc, cmd, data, flag, td) break; case PPPIOCGUNIT: - *(int *)data = sc->sc_if.if_unit; + *(int *)data = sc->sc_if.if_dunit; break; case PPPIOCGFLAGS: @@ -850,7 +849,7 @@ pppoutput(ifp, m0, dst, rtp) len = m_length(m0, NULL); if (sc->sc_flags & SC_LOG_OUTPKT) { - printf("ppp%d output: ", ifp->if_unit); + printf("%s output: ", ifp->if_xname); pppdumpm(m0); } @@ -1214,7 +1213,7 @@ ppp_ccp(sc, m, rcvd) if (sc->sc_xc_state != NULL && (*sc->sc_xcomp->comp_init) (sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN, - sc->sc_if.if_unit, 0, sc->sc_flags & SC_DEBUG)) { + sc->sc_if.if_dunit, 0, sc->sc_flags & SC_DEBUG)) { s = splimp(); sc->sc_flags |= SC_COMP_RUN; splx(s); @@ -1224,7 +1223,7 @@ ppp_ccp(sc, m, rcvd) if (sc->sc_rc_state != NULL && (*sc->sc_rcomp->decomp_init) (sc->sc_rc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN, - sc->sc_if.if_unit, 0, sc->sc_mru, + sc->sc_if.if_dunit, 0, sc->sc_mru, sc->sc_flags & SC_DEBUG)) { s = splimp(); sc->sc_flags |= SC_DECOMP_RUN; |
