From: henning <henning@openbsd.org>
Date: Sat, 19 Apr 2014 12:12:02 +0000 (+0000)
Subject: all I wanted to do is removing the altq special casing, but then it turned
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f287df1231a1ff4fbeb1b58cc42001a732f929b5;p=openbsd

all I wanted to do is removing the altq special casing, but then it turned
out the entire codepath is unreachable. glad I'm not our ppp maintainer, he
has work to do.
kill that unreachable code, with & ok claudio
---

diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index d452fd22645..740be62971c 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.120 2014/04/14 09:06:42 mpi Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.121 2014/04/19 12:12:02 henning Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -644,7 +644,6 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 {
 	struct sppp *sp = (struct sppp*) ifp;
 	struct ppp_header *h;
-	struct ifqueue *ifq = NULL;
 	struct timeval tv;
 	int s, len, rv = 0;
 	u_int16_t protocol;
@@ -819,20 +818,7 @@ sppp_output(struct ifnet *ifp, struct mbuf *m,
 	 * not yet active.
 	 */
 	len = m->m_pkthdr.len;
-	if (ifq != NULL
-#ifdef ALTQ
-	    && ALTQ_IS_ENABLED(&ifp->if_snd) == 0
-#endif
-		) {
-		if (IF_QFULL (ifq)) {
-			IF_DROP (&ifp->if_snd);
-			m_freem (m);
-			if (rv == 0)
-				rv = ENOBUFS;
-		} else
-			IF_ENQUEUE (ifq, m);
-	} else
-		IFQ_ENQUEUE(&ifp->if_snd, m, NULL, rv);
+	IFQ_ENQUEUE(&ifp->if_snd, m, NULL, rv);
 
 	if (rv != 0) {
 		++ifp->if_oerrors;