diff options
| author |   damien <damien@openbsd.org> | 2006-09-18 16:20:20 +0000 |
|---|---|---|
| committer | damien <damien@openbsd.org> | 2006-09-18 16:20:20 +0000 |
| commit | e326c169eb08d20d122e7717c7356b69c46b34a5 (patch) | |
| tree | 1e710a3180450195b1fd3da884bb63ad634b61d6 /sys/dev/usb | |
| parent | KNF and clean some trailing white spaces, no binary change. (diff) | |
| download | wireguard-openbsd-e326c169eb08d20d122e7717c7356b69c46b34a5.tar.xz wireguard-openbsd-e326c169eb08d20d122e7717c7356b69c46b34a5.zip | |
don't use IF_PREPEND() on altq's.
use IFQ_POLL()/IFQ_DEQUEUE() logic instead as described in altq(4).
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_ral.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/if_uath.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_zyd.c | 7 |
4 files changed, 12 insertions, 15 deletions
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index 0d0cc0e5ef9..2cba8840604 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.79 2006/08/24 19:32:21 damien Exp $ */ +/* $OpenBSD: if_ral.c,v 1.80 2006/09/18 16:20:20 damien Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -1226,15 +1226,14 @@ ural_start(struct ifnet *ifp) } else { if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_DEQUEUE(&ifp->if_snd, m0); + IFQ_POLL(&ifp->if_snd, m0); if (m0 == NULL) break; if (sc->tx_queued >= RAL_TX_LIST_COUNT) { - IF_PREPEND(&ifp->if_snd, m0); ifp->if_flags |= IFF_OACTIVE; break; } - + IFQ_DEQUEUE(&ifp->if_snd, m0); #if NBPFILTER > 0 if (ifp->if_bpf != NULL) bpf_mtap(ifp->if_bpf, m0, BPF_DIRECTION_OUT); diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index eb224795927..dede128ace7 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.39 2006/08/24 19:32:21 damien Exp $ */ +/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> @@ -1190,15 +1190,14 @@ rum_start(struct ifnet *ifp) } else { if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_DEQUEUE(&ifp->if_snd, m0); + IFQ_POLL(&ifp->if_snd, m0); if (m0 == NULL) break; if (sc->tx_queued >= RT2573_TX_LIST_COUNT) { - IF_PREPEND(&ifp->if_snd, m0); ifp->if_flags |= IFF_OACTIVE; break; } - + IFQ_DEQUEUE(&ifp->if_snd, m0); #if NBPFILTER > 0 if (ifp->if_bpf != NULL) bpf_mtap(ifp->if_bpf, m0, BPF_DIRECTION_OUT); diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 086a78a0188..8c3131a7c81 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.5 2006/09/18 01:42:30 jsg Exp $ */ +/* $OpenBSD: if_uath.c,v 1.6 2006/09/18 16:20:20 damien Exp $ */ /*- * Copyright (c) 2006 @@ -1507,14 +1507,14 @@ uath_start(struct ifnet *ifp) } else { if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_DEQUEUE(&ifp->if_snd, m0); + IFQ_POLL(&ifp->if_snd, m0); if (m0 == NULL) break; if (sc->tx_queued >= UATH_TX_DATA_LIST_COUNT) { - IF_PREPEND(&ifp->if_snd, m0); ifp->if_flags |= IFF_OACTIVE; break; } + IFQ_DEQUEUE(&ifp->if_snd, m0); #if NBPFILTER > 0 if (ifp->if_bpf != NULL) bpf_mtap(ifp->if_bpf, m0, BPF_DIRECTION_OUT); diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index c8fb7bbb01d..fd92f627d40 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.25 2006/08/24 13:16:02 jsg Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.26 2006/09/18 16:20:20 damien Exp $ */ /* * Copyright (c) 2006 by Florian Stoehr <ich@florian-stoehr.de> @@ -3487,16 +3487,15 @@ zyd_start(struct ifnet *ifp) if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_DEQUEUE(&ifp->if_snd, m0); - + IFQ_POLL(&ifp->if_snd, m0); if (m0 == NULL) break; if (sc->tx_queued >= ZYD_TX_LIST_CNT) { - IF_PREPEND(&ifp->if_snd, m0); ifp->if_flags |= IFF_OACTIVE; break; } + IFQ_DEQUEUE(&ifp->if_snd, m0); if (m0->m_len < sizeof (struct ether_header) && !(m0 = m_pullup(m0, sizeof (struct ether_header)))) |