Index: if_sk.c =================================================================== RCS file: /usr/store/mlaier/fcvs/src/sys/pci/if_sk.c,v retrieving revision 1.92 diff -u -r1.92 if_sk.c --- if_sk.c 17 Nov 2004 21:35:22 -0000 1.92 +++ if_sk.c 16 Dec 2004 17:40:18 -0000 @@ -1387,7 +1387,9 @@ ifp->if_watchdog = sk_watchdog; ifp->if_init = sk_init; ifp->if_baudrate = 1000000000; - ifp->if_snd.ifq_maxlen = SK_TX_RING_CNT - 1; + IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1); + ifp->if_snd.ifq_drv_maxlen = SK_TX_RING_CNT - 1; + IFQ_SET_READY(&ifp->if_snd); callout_handle_init(&sc_if->sk_tick_ch); @@ -1844,7 +1846,7 @@ idx = sc_if->sk_cdata.sk_tx_prod; while(sc_if->sk_cdata.sk_tx_chain[idx].sk_mbuf == NULL) { - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) break; @@ -1854,7 +1856,7 @@ * for the NIC to drain the ring. */ if (sk_encap(sc_if, m_head, &idx)) { - IF_PREPEND(&ifp->if_snd, m_head); + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_flags |= IFF_OACTIVE; break; } @@ -2257,9 +2259,9 @@ CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask); - if (ifp0 != NULL && ifp0->if_snd.ifq_head != NULL) + if (ifp0 != NULL && !IFQ_DRV_IS_EMPTY(&ifp0->if_snd)) sk_start(ifp0); - if (ifp1 != NULL && ifp1->if_snd.ifq_head != NULL) + if (ifp1 != NULL && !IFQ_DRV_IS_EMPTY(&ifp1->if_snd)) sk_start(ifp1); SK_UNLOCK(sc);