diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-06 22:08:51 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2011-07-06 22:08:51 +0000 |
| commit | 78ccd5167918d349d6b63f3c77e643e2d06ccc0f (patch) | |
| tree | 1b3437216b365d9bac5418a1126dcd305ecec5f3 | |
| parent | e1dd49a1a9d3b2469f5443f276fb7a8147244c04 (diff) | |
ppp_ifstart unconditionally. depending on ALTQ for this is ridiculous.
one tree less in my forest (for a few seconds)! ok claudio
| -rw-r--r-- | sys/net/if_ppp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index c2888bb34c4..edcf2bb258e 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ppp.c,v 1.61 2011/07/06 02:42:28 henning Exp $ */ +/* $OpenBSD: if_ppp.c,v 1.62 2011/07/06 22:08:50 henning Exp $ */ /* $NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $ */ /* @@ -163,9 +163,7 @@ static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd); static void ppp_ccp_closed(struct ppp_softc *); static void ppp_inproc(struct ppp_softc *, struct mbuf *); static void pppdumpm(struct mbuf *m0); -#ifdef ALTQ static void ppp_ifstart(struct ifnet *ifp); -#endif int ppp_clone_create(struct if_clone *, int); int ppp_clone_destroy(struct ifnet *); @@ -247,9 +245,7 @@ ppp_clone_create(ifc, unit) sc->sc_if.if_hdrlen = PPP_HDRLEN; sc->sc_if.if_ioctl = pppsioctl; sc->sc_if.if_output = pppoutput; -#ifdef ALTQ sc->sc_if.if_start = ppp_ifstart; -#endif IFQ_SET_MAXLEN(&sc->sc_if.if_snd, ifqmaxlen); IFQ_SET_MAXLEN(&sc->sc_inq, ifqmaxlen); IFQ_SET_MAXLEN(&sc->sc_fastq, ifqmaxlen); @@ -1608,11 +1604,6 @@ done: printf("%s\n", buf); } -#ifdef ALTQ -/* - * a wrapper to transmit a packet from if_start since ALTQ uses - * if_start to send a packet. - */ static void ppp_ifstart(ifp) struct ifnet *ifp; @@ -1622,6 +1613,4 @@ ppp_ifstart(ifp) sc = ifp->if_softc; (*sc->sc_start)(sc); } -#endif - #endif /* NPPP > 0 */ |