diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-11 10:07:26 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-11 10:07:26 +0000 |
commit | 4eb5b488d2f448bf009b5b4aa8c700ae567efb5a (patch) | |
tree | d50ddb1b8c9e2ca1fae9d327f81bcc6cfee3684e | |
parent | c926a088879531398a578d3d259cc3c47d0b7359 (diff) |
Kill useless IFQ_POLL().
ok dlg@
-rw-r--r-- | sys/dev/ic/bwi.c | 5 | ||||
-rw-r--r-- | sys/dev/pcmcia/if_malo.c | 5 | ||||
-rw-r--r-- | sys/dev/sbus/qe.c | 5 | ||||
-rw-r--r-- | sys/dev/usb/if_upgt.c | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 66503b6ccc4..c6f057e7eb4 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.119 2015/11/04 12:11:59 dlg Exp $ */ +/* $OpenBSD: bwi.c,v 1.120 2015/11/11 10:07:25 mpi Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -7205,11 +7205,10 @@ bwi_start(struct ifnet *ifp) if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_POLL(&ifp->if_snd, m); + IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - IFQ_DEQUEUE(&ifp->if_snd, m); if (m->m_len < sizeof(*eh)) { m = m_pullup(m, sizeof(*eh)); diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 929afefb4e4..75f6e8c27c7 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.86 2015/10/25 13:13:06 mpi Exp $ */ +/* $OpenBSD: if_malo.c,v 1.87 2015/11/11 10:07:25 mpi Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -992,11 +992,10 @@ cmalo_start(struct ifnet *ifp) if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; - IFQ_POLL(&ifp->if_snd, m); + IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) return; - IFQ_DEQUEUE(&ifp->if_snd, m); #if NBPFILTER > 0 if (ifp->if_bpf) diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index e029eda1c55..2d0a2c94397 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qe.c,v 1.32 2015/10/25 13:13:06 mpi Exp $ */ +/* $OpenBSD: qe.c,v 1.33 2015/11/11 10:07:25 mpi Exp $ */ /* $NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $ */ /*- @@ -450,11 +450,10 @@ qestart(ifp) bix = sc->sc_rb.rb_tdhead; for (;;) { - IFQ_POLL(&ifp->if_snd, m); + IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - IFQ_DEQUEUE(&ifp->if_snd, m); #if NBPFILTER > 0 /* diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 108bcddfa10..8daab1f4d46 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.71 2015/11/04 12:12:00 dlg Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.72 2015/11/11 10:07:25 mpi Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -1398,11 +1398,10 @@ upgt_start(struct ifnet *ifp) if (ic->ic_state != IEEE80211_S_RUN) break; - IFQ_POLL(&ifp->if_snd, m); + IFQ_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - IFQ_DEQUEUE(&ifp->if_snd, m); #if NBPFILTER > 0 if (ifp->if_bpf != NULL) bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT); |