--- src/sys/dev/netif/owi/Attic/if_owi.c 2005/01/23 20:21:31 1.3 +++ src/sys/dev/netif/owi/Attic/if_owi.c 2005/02/19 01:13:46 1.4 @@ -84,6 +84,7 @@ #include #include +#include #include #include #include @@ -274,7 +275,8 @@ owi_generic_attach(device_t dev) ifp->if_watchdog = wi_watchdog; ifp->if_init = wi_init; ifp->if_baudrate = 10000000; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); + ifq_set_ready(&ifp->if_snd); bzero(sc->wi_node_name, sizeof(sc->wi_node_name)); bcopy(WI_DEFAULT_NODENAME, sc->wi_node_name, @@ -966,7 +968,7 @@ wi_intr(xsc) /* Re-enable interrupts. */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); - if (ifp->if_snd.ifq_head != NULL) { + if (!ifq_is_empty(&ifp->if_snd)) { wi_start(ifp); } @@ -2257,7 +2259,7 @@ wi_start(ifp) } nextpkt: - IF_DEQUEUE(&ifp->if_snd, m0); + m0 = ifq_dequeue(&ifp->if_snd); if (m0 == NULL) { WI_UNLOCK(sc, s); return;