Index: if_sis.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/pci/if_sis.c,v
retrieving revision 1.101
diff -u -r1.101 if_sis.c
--- if_sis.c	9 Jun 2004 14:34:03 -0000	1.101
+++ if_sis.c	19 Jun 2004 03:52:50 -0000
@@ -1361,7 +1361,9 @@
 	ifp->if_watchdog = sis_watchdog;
 	ifp->if_init = sis_init;
 	ifp->if_baudrate = 10000000;
-	ifp->if_snd.ifq_maxlen = SIS_TX_LIST_CNT - 1;
+	IFQ_SET_MAXLEN(&ifp->if_snd, SIS_TX_LIST_CNT - 1);
+	ifp->if_snd.ifq_drv_maxlen = SIS_TX_LIST_CNT - 1;
+	IFQ_SET_READY(&ifp->if_snd);
 
 	/*
 	 * Do MII setup.
@@ -1751,7 +1753,7 @@
 	if (!sc->sis_link && mii->mii_media_status & IFM_ACTIVE &&
 	    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
 		sc->sis_link++;
-		if (ifp->if_snd.ifq_head != NULL)
+		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			sis_start(ifp);
 	}
 
@@ -1790,7 +1792,7 @@
 	sc->rxcycles = count;
 	sis_rxeof(sc);
 	sis_txeof(sc);
-	if (ifp->if_snd.ifq_head != NULL)
+	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		sis_start(ifp);
 
 	if (sc->rxcycles > 0 || cmd == POLL_AND_CHECK_STATUS) {
@@ -1877,7 +1879,7 @@
 	/* Re-enable interrupts. */
 	CSR_WRITE_4(sc, SIS_IER, 1);
 
-	if (ifp->if_snd.ifq_head != NULL)
+	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		sis_start(ifp);
 done:
 	SIS_UNLOCK(sc);
@@ -1994,12 +1996,12 @@
 	}
 
 	while(sc->sis_ldata.sis_tx_list[idx].sis_mbuf == NULL) {
-		IF_DEQUEUE(&ifp->if_snd, m_head);
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
 		if (m_head == NULL)
 			break;
 
 		if (sis_encap(sc, &m_head, &idx)) {
-			IF_PREPEND(&ifp->if_snd, m_head);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
 		}
@@ -2361,7 +2363,7 @@
 	sis_reset(sc);
 	sis_init(sc);
 
-	if (ifp->if_snd.ifq_head != NULL)
+	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		sis_start(ifp);
 
 	SIS_UNLOCK(sc);