diff options
Diffstat (limited to 'sys/net/if_ppp.c')
| -rw-r--r-- | sys/net/if_ppp.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 04b996a7918..38b9d10df16 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.43 2006/01/04 06:04:42 canacar Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.44 2006/03/04 22:40:15 brad Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -262,7 +262,7 @@ ppp_clone_create(ifc, unit) #if NBPFILTER > 0 bpfattach(&sc->sc_bpf, &sc->sc_if, DLT_PPP, PPP_HDRLEN); #endif - s = splimp(); + s = splnet(); LIST_INSERT_HEAD(&ppp_softc_list, sc, sc_list); splx(s); @@ -279,7 +279,7 @@ ppp_clone_destroy(ifp) if (sc->sc_devp != NULL) return (EBUSY); - s = splimp(); + s = splnet(); LIST_REMOVE(sc, sc_list); splx(s); @@ -443,7 +443,7 @@ pppioctl(sc, cmd, data, flag, p) if (sc->sc_flags & SC_CCP_OPEN && !(flags & SC_CCP_OPEN)) ppp_ccp_closed(sc); #endif - splimp(); + splnet(); sc->sc_flags = (sc->sc_flags & ~SC_MASK) | flags; splx(s); break; @@ -509,7 +509,7 @@ pppioctl(sc, cmd, data, flag, p) sc->sc_if.if_xname); error = ENOBUFS; } - splimp(); + splnet(); sc->sc_flags &= ~SC_COMP_RUN; splx(s); } else { @@ -524,7 +524,7 @@ pppioctl(sc, cmd, data, flag, p) sc->sc_if.if_xname); error = ENOBUFS; } - splimp(); + splnet(); sc->sc_flags &= ~SC_DECOMP_RUN; splx(s); } @@ -593,7 +593,7 @@ pppioctl(sc, cmd, data, flag, p) newcode = 0; bp = (cmd == PPPIOCSPASS)? &sc->sc_pass_filt: &sc->sc_active_filt; oldcode = bp->bf_insns; - s = splimp(); + s = splnet(); bp->bf_len = nbp->bf_len; bp->bf_insns = newcode; splx(s); @@ -623,7 +623,7 @@ pppsioctl(ifp, cmd, data) #ifdef PPP_COMPRESS struct ppp_comp_stats *pcp; #endif - int s = splimp(), error = 0; + int s = splnet(), error = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -954,7 +954,7 @@ void ppp_restart(sc) struct ppp_softc *sc; { - int s = splimp(); + int s = splnet(); sc->sc_flags &= ~SC_TBUSY; schednetisr(NETISR_PPP); @@ -1109,13 +1109,13 @@ pppintr() LIST_FOREACH(sc, &ppp_softc_list, sc_list) { if (!(sc->sc_flags & SC_TBUSY) && (IFQ_IS_EMPTY(&sc->sc_if.if_snd) == 0 || sc->sc_fastq.ifq_head)) { - s2 = splimp(); + s2 = splnet(); sc->sc_flags |= SC_TBUSY; splx(s2); (*sc->sc_start)(sc); } for (;;) { - s2 = splimp(); + s2 = splnet(); IF_DEQUEUE(&sc->sc_rawq, m); splx(s2); if (m == NULL) @@ -1171,7 +1171,7 @@ ppp_ccp(sc, m, rcvd) case CCP_TERMACK: /* CCP must be going down - disable compression */ if (sc->sc_flags & SC_CCP_UP) { - s = splimp(); + s = splnet(); sc->sc_flags &= ~(SC_CCP_UP | SC_COMP_RUN | SC_DECOMP_RUN); splx(s); } @@ -1187,7 +1187,7 @@ ppp_ccp(sc, m, rcvd) && (*sc->sc_xcomp->comp_init) (sc->sc_xc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN, sc->sc_unit, 0, sc->sc_flags & SC_DEBUG)) { - s = splimp(); + s = splnet(); sc->sc_flags |= SC_COMP_RUN; splx(s); } @@ -1198,7 +1198,7 @@ ppp_ccp(sc, m, rcvd) (sc->sc_rc_state, dp + CCP_HDRLEN, slen - CCP_HDRLEN, sc->sc_unit, 0, sc->sc_mru, sc->sc_flags & SC_DEBUG)) { - s = splimp(); + s = splnet(); sc->sc_flags |= SC_DECOMP_RUN; sc->sc_flags &= ~(SC_DC_ERROR | SC_DC_FERROR); splx(s); @@ -1215,7 +1215,7 @@ ppp_ccp(sc, m, rcvd) } else { if (sc->sc_rc_state && (sc->sc_flags & SC_DECOMP_RUN)) { (*sc->sc_rcomp->decomp_reset)(sc->sc_rc_state); - s = splimp(); + s = splnet(); sc->sc_flags &= ~SC_DC_ERROR; splx(s); } @@ -1255,7 +1255,7 @@ ppppktin(sc, m, lost) struct mbuf *m; int lost; { - int s = splimp(); + int s = splnet(); if (lost) m->m_flags |= M_ERRMARK; @@ -1301,7 +1301,7 @@ ppp_inproc(sc, m) if (m->m_flags & M_ERRMARK) { m->m_flags &= ~M_ERRMARK; - s = splimp(); + s = splnet(); sc->sc_flags |= SC_VJ_RESET; splx(s); } @@ -1333,7 +1333,7 @@ ppp_inproc(sc, m) */ if (sc->sc_flags & SC_DEBUG) printf("%s: decompress failed %d\n", ifp->if_xname, rv); - s = splimp(); + s = splnet(); sc->sc_flags |= SC_VJ_RESET; if (rv == DECOMP_ERROR) sc->sc_flags |= SC_DC_ERROR; @@ -1364,7 +1364,7 @@ ppp_inproc(sc, m) */ if (sc->sc_comp) sl_uncompress_tcp(NULL, 0, TYPE_ERROR, sc->sc_comp); - s = splimp(); + s = splnet(); sc->sc_flags &= ~SC_VJ_RESET; splx(s); } @@ -1522,7 +1522,7 @@ ppp_inproc(sc, m) /* * Put the packet on the appropriate input queue. */ - s = splimp(); + s = splnet(); if (IF_QFULL(inq)) { IF_DROP(inq); splx(s); |