ALTQ cleanout

ok brad@

2 files changed, 3 insertions, 20 deletions

diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index a7a60f4c01a..80ae9638dc8 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.85 2005/05/22 01:10:23 brad Exp $	*/
+/*	$OpenBSD: dc.c,v 1.86 2005/05/22 19:29:55 martin Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2671,12 +2671,10 @@ dc_encap(sc, m_head, txidx)
 	if (sc->dc_flags & DC_TX_USE_TX_INTR && sc->dc_cdata.dc_tx_cnt > 64)
 		sc->dc_ldata->dc_tx_list[cur].dc_ctl |=
 		    htole32(DC_TXCTL_FINT);
-#ifdef ALTQ
 	else if ((sc->dc_flags & DC_TX_USE_TX_INTR) &&
 		 TBR_IS_ENABLED(&sc->sc_arpcom.ac_if.if_snd))
 		sc->dc_ldata->dc_tx_list[cur].dc_ctl |=
 		    htole32(DC_TXCTL_FINT);
-#endif
 	bus_dmamap_sync(sc->sc_dmat, map, 0, map->dm_mapsize,
 	    BUS_DMASYNC_PREWRITE);
 
@@ -2760,11 +2758,9 @@ dc_start(ifp)
 		if (sc->dc_flags & DC_TX_COALESCE &&
 		    (m_head->m_next != NULL ||
 			sc->dc_flags & DC_TX_ALIGN)) {
-#ifdef ALTQ
 			/* note: dc_coal breaks the poll-and-dequeue rule.
 			 * if dc_coal fails, we lose the packet.
 			 */
-#endif
 			IFQ_DEQUEUE(&ifp->if_snd, m_head);
 			if (dc_coal(sc, &m_head)) {
 				ifp->if_flags |= IFF_OACTIVE;
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 58032ea5352..035ae5aeeb7 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.66 2005/04/23 01:45:55 martin Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.67 2005/05/22 19:29:55 martin Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -4082,11 +4082,9 @@ tulip_txput(
     int segcnt, free;
     u_int32_t d_status;
     struct mbuf *m0;
-#if 1 /* ALTQ */
     struct ifnet *ifp = &sc->tulip_if;
     struct mbuf *ombuf = m;
     int compressed = 0;
-#endif
 
 #if defined(TULIP_DEBUG)
     if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) {
@@ -4140,7 +4138,6 @@ tulip_txput(
 		 * entries that we can use for one packet, so we have
 		 * recopy it into one mbuf and then try again.
 		 */
-#if 1 /* ALTQ */
 		struct mbuf *tmp;
 		/*
 		 * tulip_mbuf_compress() frees the original mbuf.
@@ -4161,7 +4158,6 @@ tulip_txput(
 		if (tmp != ombuf)
 		    panic("tulip_txput: different mbuf dequeued!");
 		compressed = 1;
-#endif
 		m = tulip_mbuf_compress(m);
 		if (m == NULL)
 		    goto finish;
@@ -4228,7 +4224,6 @@ tulip_txput(
      * The descriptors have been filled in.  Now get ready
      * to transmit.
      */
-#if 1 /* ALTQ */
     if (!compressed && (sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0) {
 	/* remove the mbuf from the queue */
 	struct mbuf *tmp;
@@ -4236,7 +4231,6 @@ tulip_txput(
 	if (tmp != ombuf)
 	    panic("tulip_txput: different mbuf dequeued!");
     }
-#endif
 
     IF_ENQUEUE(&sc->tulip_txq, m);
     m = NULL;
@@ -4598,14 +4592,12 @@ tulip_ifioctl(
     return error;
 }
 
-#if 1 /* ALTQ */
 /*
  * the original dequeueing policy is dequeue-and-prepend if something
  * goes wrong.  when altq is used, it is changed to peek-and-dequeue.
  * the modification becomes a bit complicated since tulip_txput() might
  * copy and modify the mbuf passed.
  */
-#endif
 /*
  * These routines gets called at device spl (from ether_output).  This might
  * pose a problem for TULIP_USE_SOFTINTR if ether_output is called at
@@ -4636,12 +4628,7 @@ tulip_ifstart(
 		break;
 	    }
 	}
-#ifdef ALTQ
-	if (0) /* don't switch to the one packet mode */
-#else
-	if (IFQ_IS_EMPTY(&sc->tulip_if.if_snd))
-#endif
-	    sc->tulip_if.if_start = tulip_ifstart_one;
+	sc->tulip_if.if_start = tulip_ifstart_one;
     }
 
     TULIP_PERFEND(ifstart);