diff options
| author | Christian Brueffer <brueffer@FreeBSD.org> | 2007-05-21 18:13:11 +0000 |
|---|---|---|
| committer | Christian Brueffer <brueffer@FreeBSD.org> | 2007-05-21 18:13:11 +0000 |
| commit | 2be2f5ca3a6f1c25b361f6fdfcd4317de0ed0932 (patch) | |
| tree | 652e6d24bc43024b5bb963e63c1e202fe557e9d9 /sys/dev/usb | |
| parent | a1165f7d56e8715cf5ddb70b951a0230d920d307 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb')
| -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 29448bb78b95..6bb2a94ffc2e 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -489,7 +489,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; @@ -716,7 +718,7 @@ axe_tick(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); } @@ -777,14 +779,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; @@ -992,7 +994,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; |