From: henning <henning@openbsd.org>
Date: Sat, 19 Apr 2014 12:08:10 +0000 (+0000)
Subject: remove altq special casing.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=871c1e7a4e3c486f2c9de41a1dbd5f059e704411;p=openbsd

remove altq special casing.
big WTF regarding the fastq use there while verifying w/ claudio, but
that's for the ppp maintainer and unrelated
---

diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 92fc9f7304a..ab1dad08965 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.72 2014/04/14 09:06:42 mpi Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.73 2014/04/19 12:08:10 henning Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -819,11 +819,7 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 	m0->m_nextpkt = NULL;
 	sc->sc_npqtail = &m0->m_nextpkt;
     } else {
-	if ((m0->m_flags & M_HIGHPRI)
-#ifdef ALTQ
-	    && ALTQ_IS_ENABLED(&sc->sc_if.if_snd) == 0
-#endif
-	    ) {
+	if (m0->m_flags & M_HIGHPRI) {
 	    ifq = &sc->sc_fastq;
 	    if (IF_QFULL(ifq) && dst->sa_family != AF_UNSPEC) {
 		IF_DROP(ifq);
@@ -886,11 +882,7 @@ ppp_requeue(struct ppp_softc *sc)
 	     */
 	    *mpp = m->m_nextpkt;
 	    m->m_nextpkt = NULL;
-	    if ((m->m_flags & M_HIGHPRI)
-#ifdef ALTQ
-		&& ALTQ_IS_ENABLED(&sc->sc_if.if_snd) == 0
-#endif
-		) {
+	    if (m->m_flags & M_HIGHPRI) {
 		ifq = &sc->sc_fastq;
 		if (IF_QFULL(ifq)) {
 		    IF_DROP(ifq);