diff options
| author | mlaier <mlaier@FreeBSD.org> | 2006-12-01 20:29:55 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2006-12-01 20:29:55 +0000 |
| commit | 86e7537c970d691ee52a429058a151e616c61bb4 (patch) | |
| tree | 848220f8363a7489dfa91fb43eaa54bd936349f1 /sys/dev/ep/if_ep.c | |
| parent | 2ad752f0eed589fd47679b87cbac120c188145cc (diff) | |
| download | FreeBSD-src-86e7537c970d691ee52a429058a151e616c61bb4.zip FreeBSD-src-86e7537c970d691ee52a429058a151e616c61bb4.tar.gz | |
ALTQify ep(4).
Tested and Requested by: Andy Brook
MFC after: 3 days
Diffstat (limited to 'sys/dev/ep/if_ep.c')
| -rw-r--r-- | sys/dev/ep/if_ep.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 2f54e01..3b91369 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -304,7 +304,9 @@ ep_attach(struct ep_softc *sc) ifp->if_ioctl = epioctl; ifp->if_watchdog = epwatchdog; ifp->if_init = epinit; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); if (!sc->epb.mii_trans) { ifmedia_init(&sc->ifmedia, 0, ep_ifmedia_upd, ep_ifmedia_sts); @@ -482,7 +484,7 @@ epstart_locked(struct ifnet *ifp) return; startagain: /* Sneak a peek at the next packet */ - IF_DEQUEUE(&ifp->if_snd, m0); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) return; for (len = 0, m = m0; m != NULL; m = m->m_next) @@ -507,7 +509,7 @@ startagain: /* make sure */ if (CSR_READ_2(sc, EP_W1_FREE_TX) < len + pad + 4) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; - IF_PREPEND(&ifp->if_snd, m0); + IFQ_DRV_PREPEND(&ifp->if_snd, m0); goto done; } } else @@ -562,7 +564,7 @@ readcheck: * we check if we have packets left, in that case * we prepare to come back later */ - if (ifp->if_snd.ifq_head) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); goto done; } @@ -672,7 +674,7 @@ rescan: * To have a tx_avail_int but giving * the chance to the Reception */ - if (ifp->if_snd.ifq_head) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) CSR_WRITE_2(sc, EP_COMMAND, SET_TX_AVAIL_THRESH | 8); } |
