diff options
| author | brueffer <brueffer@FreeBSD.org> | 2007-05-12 05:56:10 +0000 |
|---|---|---|
| committer | brueffer <brueffer@FreeBSD.org> | 2007-05-12 05:56:10 +0000 |
| commit | 3df1233c919cc68feaa366dc24897154f9a69da2 (patch) | |
| tree | 347923168d80582ee24f1922de86f5b11d7f9266 /sys/dev | |
| parent | 974acaa2d8ac5ca6e1df6cc76b45083a1585a904 (diff) | |
| download | FreeBSD-src-3df1233c919cc68feaa366dc24897154f9a69da2.zip FreeBSD-src-3df1233c919cc68feaa366dc24897154f9a69da2.tar.gz | |
ALTQify.
Submitted by: J.R. Oldroyd
Reviewed by: mlaier
Approved by: rwatson (mentor)
MFC after: 1 week
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_axe.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index a352ce7..767ae82 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -501,7 +501,9 @@ USB_ATTACH(axe) ifp->if_start = axe_start; ifp->if_watchdog = axe_watchdog; ifp->if_init = axe_init; - 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); sc->axe_qdat.ifp = ifp; sc->axe_qdat.if_rxstart = axe_rxstart; @@ -750,7 +752,7 @@ axe_tick_task(void *xsc) if (!sc->axe_link && mii->mii_media_status & IFM_ACTIVE && IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) { sc->axe_link++; - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) axe_start(ifp); } @@ -815,14 +817,14 @@ axe_start(struct ifnet *ifp) return; } - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) { AXE_UNLOCK(sc); return; } if (axe_encap(sc, m_head, 0)) { - IF_PREPEND(&ifp->if_snd, m_head); + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_drv_flags |= IFF_DRV_OACTIVE; AXE_UNLOCK(sc); return; @@ -1045,7 +1047,7 @@ axe_watchdog(struct ifnet *ifp) AXE_UNLOCK(sc); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) axe_start(ifp); return; |
