Index: if_ste.c =================================================================== RCS file: /usr/store/mlaier/fcvs/src/sys/pci/if_ste.c,v retrieving revision 1.78 diff -u -r1.78 if_ste.c --- if_ste.c 7 Jan 2005 02:29:18 -0000 1.78 +++ if_ste.c 29 Jan 2005 16:31:46 -0000 @@ -626,7 +626,7 @@ ste_rxeoc(sc); ste_rxeof(sc); ste_txeof(sc); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ste_start(ifp); if (cmd == POLL_AND_CHECK_STATUS) { @@ -719,7 +719,7 @@ /* Re-enable interrupts */ CSR_WRITE_2(sc, STE_IMR, STE_INTRS); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ste_start(ifp); #ifdef DEVICE_POLLING @@ -941,7 +941,7 @@ * otherwise we get stuck in the wrong link state */ ste_miibus_statchg(sc->ste_dev); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ste_start(ifp); } } @@ -1081,7 +1081,9 @@ ifp->if_watchdog = ste_watchdog; ifp->if_init = ste_init; ifp->if_baudrate = 10000000; - ifp->if_snd.ifq_maxlen = STE_TX_LIST_CNT - 1; + IFQ_SET_MAXLEN(&ifp->if_snd, STE_TX_LIST_CNT - 1); + ifp->if_snd.ifq_drv_maxlen = STE_TX_LIST_CNT - 1; + IFQ_SET_READY(&ifp->if_snd); sc->ste_tx_thresh = STE_TXSTART_THRESH; @@ -1604,7 +1606,7 @@ break; } - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; @@ -1672,7 +1674,7 @@ ste_reset(sc); ste_init(sc); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ste_start(ifp); STE_UNLOCK(sc);