* Robert Olsson <robert@robur.slu.se> and Paul Mackerras.
*/
-/* $Id: if_ppp.c,v 1.11 1996/07/01 05:38:25 paulus Exp $ */
+/* $Id: if_ppp.c,v 1.13 1997/03/04 03:45:17 paulus Exp $ */
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
#include "ppp-comp.h"
#endif
+static int pppsioctl(struct ifnet *, int, caddr_t);
+static int pppoutput(struct ifnet *, struct mbuf *, struct sockaddr *);
static void ppp_requeue __P((struct ppp_softc *));
static void ppp_outpkt __P((struct ppp_softc *));
static void ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));
sc->sc_if.if_mtu = PPP_MTU;
sc->sc_if.if_flags = IFF_POINTOPOINT;
sc->sc_if.if_type = IFT_PPP;
- sc->sc_if.if_hdrlen = PPP_HDRLEN;
sc->sc_if.if_ioctl = pppsioctl;
sc->sc_if.if_output = pppoutput;
sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN;
KM_ALLOC(sc->sc_comp, struct slcompress *, sizeof(struct slcompress),
KM_DEVBUF, KM_NOARG);
if (sc->sc_comp)
- sl_compress_init(sc->sc_comp, -1);
+ sl_compress_init(sc->sc_comp);
#endif
#ifdef PPP_COMPRESS
sc->sc_xc_state = NULL;
return EPERM;
if (sc->sc_comp) {
s = splnet();
- sl_compress_init(sc->sc_comp, *(int *)data);
+ sl_compress_setup(sc->sc_comp, *(int *)data);
splx(s);
}
break;
(*sc->sc_start)(sc);
}
ifp->if_opackets++;
- ifp->if_obytes += len;
splx(s);
return (0);
/*
* Transmitter has finished outputting some stuff;
- * remember to call sc->sc_start later at splsoftnet.
+ * remember to call sc->sc_start later at splnet.
*/
void
ppp_restart(sc)
/*
* Get a packet to send. This procedure is intended to be called at
- * splsoftnet, since it may involve time-consuming operations such as
+ * splnet, since it may involve time-consuming operations such as
* applying VJ compression, packet compression, address/control and/or
* protocol field compression to the packet.
*/
for (mp = m; mp != NULL; mp = mp->m_next)
slen += mp->m_len;
clen = (*sc->sc_xcomp->compress)
- (sc->sc_xc_state, &mcomp, m, slen,
- (sc->sc_flags & SC_CCP_UP? sc->sc_if.if_mtu: 0));
+ (sc->sc_xc_state, &mcomp, m, slen, sc->sc_if.if_mtu + PPP_HDRLEN);
if (mcomp != NULL) {
- m_freem(m);
- m = mcomp;
- cp = mtod(m, u_char *);
- protocol = cp[3];
+ if (sc->sc_flags & SC_CCP_UP) {
+ /* Send the compressed packet instead of the original. */
+ m_freem(m);
+ m = mcomp;
+ cp = mtod(m, u_char *);
+ protocol = cp[3];
+ } else {
+ /* Can't transmit compressed packets until CCP is up. */
+ m_freem(mcomp);
+ }
}
}
#endif /* PPP_COMPRESS */
}
/*
- * Software interrupt routine, called at splsoftnet.
+ * Software interrupt routine, called at splnet.
*/
void
pppintr()
struct mbuf *m;
sc = ppp_softc;
- s = splsoftnet();
+ s = splnet();
for (i = 0; i < NPPP; ++i, ++sc) {
if (!(sc->sc_flags & SC_TBUSY)
&& (sc->sc_if.if_snd.ifq_head || sc->sc_fastq.ifq_head)) {
smp_unlock(&lock->lk_ifqueue);
splx(s);
ifp->if_ipackets++;
- ifp->if_ibytes += ilen;
if (rv)
(*sc->sc_ctlp)(sc);