ifq: Remove the unused parameter 'mpolled' from ifq dequeue interface
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 4 Jun 2013 02:00:27 +0000 (10:00 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 4 Jun 2013 02:03:55 +0000 (10:03 +0800)
The ifq_poll() -> ifq_dequeue() model is not MPSAFE, and mpolled has
not been used, i.e. set to NULL, for years; time to let it go.

97 files changed:
sys/bus/u4b/net/if_axe.c
sys/bus/u4b/net/if_udav.c
sys/dev/atm/en/midway.c
sys/dev/netif/acx/if_acx.c
sys/dev/netif/ae/if_ae.c
sys/dev/netif/age/if_age.c
sys/dev/netif/alc/if_alc.c
sys/dev/netif/ale/if_ale.c
sys/dev/netif/an/if_an.c
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/aue/if_aue.c
sys/dev/netif/axe/if_axe.c
sys/dev/netif/bce/if_bce.c
sys/dev/netif/bfe/if_bfe.c
sys/dev/netif/bge/if_bge.c
sys/dev/netif/bnx/if_bnx.c
sys/dev/netif/bwi/if_bwi.c
sys/dev/netif/cs/if_cs.c
sys/dev/netif/cue/if_cue.c
sys/dev/netif/dc/if_dc.c
sys/dev/netif/de/if_de.c
sys/dev/netif/ed/if_ed.c
sys/dev/netif/em/if_em.c
sys/dev/netif/emx/if_emx.c
sys/dev/netif/ep/if_ep.c
sys/dev/netif/et/if_et.c
sys/dev/netif/ex/if_ex.c
sys/dev/netif/fe/if_fe.c
sys/dev/netif/fwe/if_fwe.c
sys/dev/netif/fxp/if_fxp.c
sys/dev/netif/igb/if_igb.c
sys/dev/netif/iwi/if_iwi.c
sys/dev/netif/iwl/iwl2100.c
sys/dev/netif/iwn/if_iwn.c
sys/dev/netif/ixgbe/ixgbe.c
sys/dev/netif/jme/if_jme.c
sys/dev/netif/kue/if_kue.c
sys/dev/netif/lge/if_lge.c
sys/dev/netif/lgue/if_lgue.c
sys/dev/netif/lnc/am7990.c
sys/dev/netif/lnc/am79900.c
sys/dev/netif/msk/if_msk.c
sys/dev/netif/mxge/if_mxge.c
sys/dev/netif/my/if_my.c
sys/dev/netif/ndis/if_ndis.c
sys/dev/netif/nfe/if_nfe.c
sys/dev/netif/nge/if_nge.c
sys/dev/netif/pcn/if_pcn.c
sys/dev/netif/ral/rt2560.c
sys/dev/netif/ral/rt2661.c
sys/dev/netif/re/if_re.c
sys/dev/netif/rl/if_rl.c
sys/dev/netif/rtw/rtw.c
sys/dev/netif/rue/if_rue.c
sys/dev/netif/rum/if_rum.c
sys/dev/netif/sbni/if_sbni.c
sys/dev/netif/sbsh/if_sbsh.c
sys/dev/netif/sf/if_sf.c
sys/dev/netif/sis/if_sis.c
sys/dev/netif/sk/if_sk.c
sys/dev/netif/sln/if_sln.c
sys/dev/netif/sn/if_sn.c
sys/dev/netif/ste/if_ste.c
sys/dev/netif/stge/if_stge.c
sys/dev/netif/ti/if_ti.c
sys/dev/netif/tl/if_tl.c
sys/dev/netif/tx/if_tx.c
sys/dev/netif/txp/if_txp.c
sys/dev/netif/ural/if_ural.c
sys/dev/netif/vge/if_vge.c
sys/dev/netif/vr/if_vr.c
sys/dev/netif/vx/if_vx.c
sys/dev/netif/wb/if_wb.c
sys/dev/netif/wi/if_wi.c
sys/dev/netif/wpi/if_wpi.c
sys/dev/netif/xe/if_xe.c
sys/dev/netif/xl/if_xl.c
sys/dev/virtual/vkernel/net/if_vke.c
sys/net/altq/altq_subr.c
sys/net/altq/if_altq.h
sys/net/bridge/if_bridge.c
sys/net/ef/if_ef.c
sys/net/if_loop.c
sys/net/ifq_var.h
sys/net/pf/if_pflog.c
sys/net/ppp/if_ppp.c
sys/net/sl/if_sl.c
sys/net/sppp/if_spppsubr.c
sys/net/tap/if_tap.c
sys/net/tun/if_tun.c
sys/net/vlan/if_vlan.c
sys/netgraph/eiface/ng_eiface.c
sys/netgraph/fec/ng_fec.c
sys/netgraph7/iface/ng_iface.c
sys/netgraph7/ng_eiface.c
sys/netgraph7/ng_fec.c
sys/netproto/802_11/wlan/ieee80211_output.c

index 5f8fae5..2d0a363 100644 (file)
@@ -1204,7 +1204,7 @@ tr_setup:
                DPRINTFN(11, "copying frames, 16 at a time\n");
                for (nframes = 0; nframes < 16 &&
                    !ifq_is_empty(&ifp->if_snd); nframes++) {
-                       m = ifq_dequeue(&ifp->if_snd, NULL);
+                       m = ifq_dequeue(&ifp->if_snd);
                        if (m == NULL)
                                break;
                        usbd_xfer_set_frame_offset(xfer, nframes * MCLBYTES,
index 09ce813..a2b6025 100644 (file)
@@ -566,7 +566,7 @@ tr_setup:
                         */
                        return;
                }
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
 
                if (m == NULL)
                        return;
index d53c7ee..0f81f85 100644 (file)
@@ -1483,7 +1483,7 @@ en_start(struct ifnet *ifp, struct ifaltq_subque *ifsq __unused)
 
     while (1) {
 
-      m = ifq_dequeue(&ifp->if_snd, NULL);
+      m = ifq_dequeue(&ifp->if_snd);
       if (m == NULL)
        return;         /* EMPTY: >>> exit here <<< */
     
index 1a8c5c6..eec548c 100644 (file)
@@ -1159,7 +1159,7 @@ acx_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                                break;
                        }
 
-                       m = ifq_dequeue(&ifp->if_snd, NULL);
+                       m = ifq_dequeue(&ifp->if_snd);
                        if (m == NULL)
                                break;
 
index fdc9009..df2f9b8 100644 (file)
@@ -1174,7 +1174,7 @@ ae_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        while (!ifq_is_empty(&ifp->if_snd)) {
                struct mbuf *m0;
 
-               m0 = ifq_dequeue(&ifp->if_snd, NULL);
+               m0 = ifq_dequeue(&ifp->if_snd);
                if (m0 == NULL)
                        break;  /* Nothing to do. */
 
index bea241f..1d36f3b 100644 (file)
@@ -1594,7 +1594,7 @@ age_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
        enq = 0;
        while (!ifq_is_empty(&ifp->if_snd)) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 329f74c..7557cc2 100644 (file)
@@ -2194,7 +2194,7 @@ alc_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        }
 
        for (enq = 0; !ifq_is_empty(&ifp->if_snd); ) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
                /*
index a6d88a4..4919d09 100644 (file)
@@ -1684,7 +1684,7 @@ ale_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
        enq = 0;
        while (!ifq_is_empty(&ifp->if_snd)) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index dc5735a..3746b55 100644 (file)
@@ -2511,7 +2511,7 @@ an_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
                while (sc->an_rdata.an_tx_ring[idx] == 0) {
                        ready = 1;
-                       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+                       m0 = ifq_dequeue(&ifp->if_snd);
                        if (m0 == NULL)
                                break;
 
@@ -2569,7 +2569,7 @@ an_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                while (sc->an_rdata.an_tx_empty ||
                       idx != sc->an_rdata.an_tx_cons) {
                        ready = 1;
-                       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+                       m0 = ifq_dequeue(&ifp->if_snd);
                        if (m0 == NULL)
                                break;
 
index 07868ac..570a737 100644 (file)
@@ -1831,7 +1831,7 @@ ath_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                if (bf == NULL)
                        break;
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL) {
                        STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list);
                        break;
index 26cff5f..7abe2f1 100644 (file)
@@ -1104,7 +1104,7 @@ aue_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
        }
 
-       m_head = ifq_dequeue(&ifp->if_snd, NULL);
+       m_head = ifq_dequeue(&ifp->if_snd);
        if (m_head == NULL) {
                AUE_UNLOCK(sc);
                return;
index dc84464..b9f0a56 100644 (file)
@@ -771,7 +771,7 @@ axe_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
        }
 
-       m_head = ifq_dequeue(&ifp->if_snd, NULL);
+       m_head = ifq_dequeue(&ifp->if_snd);
        if (m_head == NULL)
                return;
 
index 9e364f9..47ceb9b 100644 (file)
@@ -5014,7 +5014,7 @@ bce_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                }
 
                /* Check for any frames to send. */
-               m_head = ifsq_dequeue(ifsq, NULL);
+               m_head = ifsq_dequeue(ifsq);
                if (m_head == NULL)
                        break;
 
index a30dd49..f33e1a6 100644 (file)
@@ -1304,7 +1304,7 @@ bfe_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 0c7051f..c1b0f67 100644 (file)
@@ -3530,7 +3530,7 @@ bge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        prodidx = sc->bge_tx_prodidx;
 
        while (sc->bge_cdata.bge_tx_chain[prodidx] == NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 5330375..86be341 100644 (file)
@@ -3474,7 +3474,7 @@ bnx_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifsq_dequeue(ifsq, NULL);
+               m_head = ifsq_dequeue(ifsq);
                if (m_head == NULL)
                        break;
 
index 273ded8..172fe03 100644 (file)
@@ -1606,7 +1606,7 @@ bwi_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                                break;
                        }
 
-                       m = ifq_dequeue(&ifp->if_snd, NULL);
+                       m = ifq_dequeue(&ifp->if_snd);
                        if (m == NULL)
                                break;
 
index e2c79e7..74a3a14 100644 (file)
@@ -993,7 +993,7 @@ cs_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                if (sc->buf_len)
                        length = sc->buf_len;
                else {
-                       m = ifq_dequeue(&ifp->if_snd, NULL);
+                       m = ifq_dequeue(&ifp->if_snd);
 
                        if (m==NULL) {
                                return;
index dca44ae..00c1247 100644 (file)
@@ -830,7 +830,7 @@ cue_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
        }
 
-       m_head = ifq_dequeue(&ifp->if_snd, NULL);
+       m_head = ifq_dequeue(&ifp->if_snd);
        if (m_head == NULL) {
                CUE_UNLOCK(sc);
                return;
index b245f85..b3c4c2c 100644 (file)
@@ -3103,7 +3103,7 @@ dc_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        need_trans = 0;
        while(sc->dc_cdata.dc_tx_chain[idx] == NULL) {
                m_defragged = NULL;
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index d830e0f..16dad51 100644 (file)
@@ -3799,7 +3799,7 @@ tulip_ifstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        while (!ifq_is_empty(&sc->tulip_if.if_snd)) {
            struct mbuf *m;
 
-           m = ifq_dequeue(&sc->tulip_if.if_snd, NULL);
+           m = ifq_dequeue(&sc->tulip_if.if_snd);
            if (m == NULL)
                break;
 
index 56381ef..b7fb6d9 100644 (file)
@@ -2104,7 +2104,7 @@ outloop:
                ifq_set_oactive(&ifp->if_snd);
                return;
        }
-       m = ifq_dequeue(&ifp->if_snd, NULL);
+       m = ifq_dequeue(&ifp->if_snd);
        if (m == NULL) {
 
                /*
index e6f4f6e..d7fce08 100644 (file)
@@ -1001,7 +1001,7 @@ em_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                }
 
                logif(pkt_txqueue);
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 09cace7..bf3ecc9 100644 (file)
@@ -969,7 +969,7 @@ emx_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                }
 
                logif(pkt_txqueue);
-               m_head = ifsq_dequeue(ifsq, NULL);
+               m_head = ifsq_dequeue(ifsq);
                if (m_head == NULL)
                        break;
 
index bbd98ca..9511a06 100644 (file)
@@ -437,7 +437,7 @@ ep_if_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
 startagain:
     /* Sneak a peek at the next packet */
-    m = ifq_dequeue(&ifp->if_snd, NULL);
+    m = ifq_dequeue(&ifp->if_snd);
     if (m == NULL) {
        crit_exit();
        return;
index 7aba151..fc4208f 100644 (file)
@@ -1235,7 +1235,7 @@ et_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        continue;
                }
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 64b2c52..7d854ba 100644 (file)
@@ -377,7 +377,7 @@ ex_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
         * more packets left, or the card cannot accept any more yet.
         */
        while (!ifq_is_oactive(&ifp->if_snd)) {
-               opkt = ifq_dequeue(&ifp->if_snd, NULL);
+               opkt = ifq_dequeue(&ifp->if_snd);
                if (opkt == NULL)
                        break;
 
index 7b03a5f..f845085 100644 (file)
@@ -1256,7 +1256,7 @@ fe_start (struct ifnet *ifp, struct ifaltq_subque *ifsq)
                /*
                 * Get the next mbuf chain for a packet to send.
                 */
-               m = ifq_dequeue(&sc->sc_if.if_snd, NULL);
+               m = ifq_dequeue(&sc->sc_if.if_snd);
                if (m == NULL) {
                        /* No more packets to send.  */
                        goto indicate_inactive;
index 927a5a8..65fccd9 100644 (file)
@@ -497,7 +497,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp)
                        if_printf(ifp, "lack of xfer\n");
                        return;
                }
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                STAILQ_REMOVE_HEAD(&fwe->xferlist, link);
index ad78944..a2d9cb7 100644 (file)
@@ -1082,7 +1082,7 @@ fxp_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                /*
                 * Grab a packet to transmit.
                 */
-               mb_head = ifq_dequeue(&ifp->if_snd, NULL);
+               mb_head = ifq_dequeue(&ifp->if_snd);
                if (mb_head == NULL)
                        break;
 tbdinit:
index 9a854de..7e7941f 100644 (file)
@@ -3484,7 +3484,7 @@ igb_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifsq_dequeue(ifsq, NULL);
+               m_head = ifsq_dequeue(ifsq);
                if (m_head == NULL)
                        break;
 
index ca5aa79..ab1283f 100644 (file)
@@ -1936,7 +1936,7 @@ iwi_start_locked(struct ifnet *ifp)
                return;
 
        for (;;) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                ac = M_WME_GETAC(m);
index 9647a62..0c555b6 100644 (file)
@@ -869,7 +869,7 @@ iwl2100_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                struct ether_header *eh;
                struct mbuf *m;
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 6049252..dd77123 100644 (file)
@@ -3379,7 +3379,7 @@ iwn_start_locked(struct ifnet *ifp)
                        ifq_set_oactive(&ifp->if_snd);
                        break;
                }
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                KKASSERT(M_TRAILINGSPACE(m) >= 0);
index a3effd4..db1ca76 100644 (file)
@@ -701,7 +701,7 @@ ixgbe_start_locked(struct tx_ring *txr, struct ifnet * ifp)
                        break;
                 }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 7f65ded..e195da4 100644 (file)
@@ -1860,7 +1860,7 @@ jme_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 5e532c9..e58cbe1 100644 (file)
@@ -800,7 +800,7 @@ kue_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
        }
 
-       m_head = ifq_dequeue(&ifp->if_snd, NULL);
+       m_head = ifq_dequeue(&ifp->if_snd);
        if (m_head == NULL) {
                KUE_UNLOCK(sc);
                return;
index bd2244d..8082319 100644 (file)
@@ -1149,7 +1149,7 @@ lge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                }
 
                m_defragged = NULL;
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 52f3bf4..a0b6615 100644 (file)
@@ -510,7 +510,7 @@ lgue_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        }
 
        /* To internal queue */
-       while ((m_head = ifq_dequeue(&ifp->if_snd, NULL)) != NULL) {
+       while ((m_head = ifq_dequeue(&ifp->if_snd)) != NULL) {
                if (lgue_encap(sc, m_head)) {
                        m_freem(m_head);
                        break;
index acae9af..69be61f 100644 (file)
@@ -509,7 +509,7 @@ am7990_start_locked(struct lance_softc *sc)
                            sc->sc_no_td, sc->sc_last_td);
                }
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 3245286..67bde58 100644 (file)
@@ -545,7 +545,7 @@ am79900_start_locked(struct lance_softc *sc)
                            sc->sc_no_td, sc->sc_last_td);
                }
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 32da13b..cd06a58 100644 (file)
@@ -2629,7 +2629,7 @@ msk_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index a94a3fc..ec85573 100644 (file)
@@ -2177,7 +2177,7 @@ mxge_start_locked(struct mxge_slice_state *ss)
        ifp = sc->ifp;
        tx = &ss->tx;
        while ((tx->mask - (tx->req - tx->done)) > tx->max_desc) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL) {
                        return;
                }
index 4d8a59f..46dce23 100644 (file)
@@ -1354,7 +1354,7 @@ my_start(struct ifnet * ifp, struct ifaltq_subque *ifsq)
 
        start_tx = sc->my_cdata.my_tx_free;
        while (sc->my_cdata.my_tx_free->my_mbuf == NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 02927cf..42c910a 100644 (file)
@@ -1822,7 +1822,7 @@ ndis_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        p0 = &sc->ndis_txarray[sc->ndis_txidx];
 
        while(sc->ndis_txpending) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 4c3152d..9c3d4be 100644 (file)
@@ -1384,7 +1384,7 @@ nfe_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        continue;
                }
 
-               m0 = ifq_dequeue(&ifp->if_snd, NULL);
+               m0 = ifq_dequeue(&ifp->if_snd);
                if (m0 == NULL)
                        break;
 
index c957481..1fbbf74 100644 (file)
@@ -1648,7 +1648,7 @@ nge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                int cnt;
 
                m_defragged = NULL;
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index bcdd757..5f48331 100644 (file)
@@ -1018,7 +1018,7 @@ pcn_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                int cnt;
 
                m_defragged = NULL;
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 4d3c16e..74d4008 100644 (file)
@@ -1916,7 +1916,7 @@ rt2560_start_locked(struct ifnet *ifp)
        struct ieee80211_node *ni;
 
        for (;;) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                if (sc->txq.queued >= RT2560_TX_RING_COUNT - 1) {
index 1e10960..15c62b5 100644 (file)
@@ -1619,7 +1619,7 @@ rt2661_start_locked(struct ifnet *ifp)
                return;
 
        for (;;) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 
index 172848b..50bc7af 100644 (file)
@@ -2489,7 +2489,7 @@ re_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 8f21fcc..dd9b767 100644 (file)
@@ -1354,7 +1354,7 @@ rl_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
 
        while (RL_CUR_TXMBUF(sc) == NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 81f47c0..d295f02 100644 (file)
@@ -2963,7 +2963,7 @@ rtw_dequeue(struct ifnet *ifp, struct rtw_txsoft_blk **tsbp,
                return 0;
        }
 
-       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+       m0 = ifq_dequeue(&ifp->if_snd);
        if (m0 == NULL) {
                DPRINTF(sc, RTW_DEBUG_XMIT,
                        ("%s: no frame ready\n", ifp->if_xname));
index 64413ca..47fcc26 100644 (file)
@@ -999,7 +999,7 @@ rue_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
        }
 
-       m_head = ifq_dequeue(&ifp->if_snd, NULL);
+       m_head = ifq_dequeue(&ifp->if_snd);
        if (m_head == NULL) {
                RUE_UNLOCK(sc);
                return;
index b8091fa..5872693 100644 (file)
@@ -1172,7 +1172,7 @@ rum_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                                break;
                        }
 
-                       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+                       m0 = ifq_dequeue(&ifp->if_snd);
                        if (m0 == NULL)
                                break;
 
index 1d06143..de465c9 100644 (file)
@@ -658,7 +658,7 @@ prepare_to_send(struct sbni_softc *sc)
        sc->state &= ~(FL_WAIT_ACK | FL_NEED_RESEND);
 
        for (;;) {
-               sc->tx_buf_p = ifq_dequeue(&sc->arpcom.ac_if.if_snd, NULL);
+               sc->tx_buf_p = ifq_dequeue(&sc->arpcom.ac_if.if_snd);
                if (sc->tx_buf_p == NULL) {
                        /* nothing to transmit... */
                        sc->pktlen     = 0;
index 1fabb01..ce96d2f 100644 (file)
@@ -614,7 +614,7 @@ start_xmit_frames(struct sbsh_softc *sc)
        while (sc->tail_xq != ((sc->head_xq - 1) & (XQLEN - 1))
            && sc->regs->LTDR != ((sc->head_tdesc - 1) & 0x7f)) {
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                if (m->m_pkthdr.len) {
index 3aeb47b..fce02dc 100644 (file)
@@ -1283,7 +1283,7 @@ sf_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 #endif
 
                m_defragged = NULL;
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 2f84ab6..69f1553 100644 (file)
@@ -1720,7 +1720,7 @@ sis_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 43e6e9d..cf8d6dc 100644 (file)
@@ -1719,7 +1719,7 @@ sk_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index d2fb7dc..1b358ed 100644 (file)
@@ -747,7 +747,7 @@ sln_tx(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        while (SL_CUR_TXBUF(sc) == NULL) {      /* SL_CUR_TXBUF(x) = x->sln_bufdata.sln_tx_buf[x->sln_bufdata.cur_tx] */
                entry = sc->sln_bufdata.cur_tx;
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index a3d3a54..44e7fca 100644 (file)
@@ -364,7 +364,7 @@ startagain:
        /*
         * Sneak a peek at the next packet
         */
-       m = ifq_dequeue(&ifp->if_snd, NULL);
+       m = ifq_dequeue(&ifp->if_snd);
        if (m == NULL)
                return;
 
@@ -570,7 +570,7 @@ snresume(struct ifnet *ifp)
        /*
         * Sneak a peek at the next packet
         */
-       m = ifq_dequeue(&ifp->if_snd, NULL);
+       m = ifq_dequeue(&ifp->if_snd);
        if (m == NULL) {
                kprintf("%s: snresume() with nothing to send\n",
                        ifp->if_xname);
index 69633d1..93a1e7a 100644 (file)
@@ -1435,7 +1435,7 @@ ste_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index f1ddd5c..3bfba8f 100644 (file)
@@ -1204,7 +1204,7 @@ stge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 0e8ed2b..55eb8b9 100644 (file)
@@ -1916,7 +1916,7 @@ ti_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
        need_trans = 0;
        while(sc->ti_cdata.ti_tx_chain[prodidx] == NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 94677f1..eea5350 100644 (file)
@@ -1843,7 +1843,7 @@ tl_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        start_tx = sc->tl_cdata.tl_tx_free;
 
        while(sc->tl_cdata.tl_tx_free != NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 642acc4..d3cdc52 100644 (file)
@@ -492,7 +492,7 @@ epic_ifstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                flist = sc->tx_flist + sc->cur_tx;
 
                /* Get next packet to send */
-               m0 = ifq_dequeue(&ifp->if_snd, NULL);
+               m0 = ifq_dequeue(&ifp->if_snd);
 
                /* If nothing to send, return */
                if (m0 == NULL)
index 46f8a8a..1048373 100644 (file)
@@ -1212,7 +1212,7 @@ txp_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        goto oactive;
 
                m_defragged = NULL;
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
 again:
index c5d1162..bc53045 100644 (file)
@@ -1416,7 +1416,7 @@ ural_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                                break;
                        }
 
-                       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+                       m0 = ifq_dequeue(&ifp->if_snd);
                        if (m0 == NULL)
                                break;
 
index 9a8b149..8522b79 100644 (file)
@@ -1715,7 +1715,7 @@ vge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index e6dd4e5..47af71d 100644 (file)
@@ -1349,7 +1349,7 @@ vr_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                struct mbuf *m_head;
                struct vr_chain *cur_tx;
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index f21a6e3..895e45c 100644 (file)
@@ -396,7 +396,7 @@ vxstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
 startagain:
     /* Sneak a peek at the next packet */
-    m0 = ifq_dequeue(&ifp->if_snd, NULL);
+    m0 = ifq_dequeue(&ifp->if_snd);
     if (m0 == NULL)
        return;
 
index d69eec8..17468b3 100644 (file)
@@ -1314,7 +1314,7 @@ wb_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        start_tx = sc->wb_cdata.wb_tx_free;
 
        while (sc->wb_cdata.wb_tx_free->wb_mbuf == NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index 666717d..017472b 100644 (file)
@@ -940,7 +940,7 @@ wi_start_locked(struct ifnet *ifp)
        memset(&frmhdr, 0, sizeof(frmhdr));
        cur = sc->sc_txnext;
        for (;;) {
-               m0 = ifq_dequeue(&ifp->if_snd, NULL);
+               m0 = ifq_dequeue(&ifp->if_snd);
                if (m0 == NULL)
                        break;
                if (sc->sc_txd[cur].d_len != 0) {
index edb2373..05f2585 100644 (file)
@@ -2032,7 +2032,7 @@ wpi_start_locked(struct ifnet *ifp)
        }
 
        for (;;) {
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                ac = M_WME_GETAC(m);
index 1edcff4..ba1ae08 100644 (file)
@@ -486,7 +486,7 @@ xe_start(struct ifnet *ifp, struct ifaltq_subque *ifsq) {
    */
   while (1) {
     /* Suck a packet off the send queue */
-    mbp = ifq_dequeue(&ifp->if_snd, NULL);
+    mbp = ifq_dequeue(&ifp->if_snd);
     if (mbp == NULL) {
       /*
        * We are using the !OACTIVE flag to indicate to the outside
index 631d340..47d95ef 100644 (file)
@@ -2522,7 +2522,7 @@ xl_start_body(struct ifnet *ifp, int proc_rx)
        start_tx = sc->xl_cdata.xl_tx_free;
 
        while(sc->xl_cdata.xl_tx_free != NULL) {
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
@@ -2645,7 +2645,7 @@ xl_start_90xB(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                        break;
                }
 
-               m_head = ifq_dequeue(&ifp->if_snd, NULL);
+               m_head = ifq_dequeue(&ifp->if_snd);
                if (m_head == NULL)
                        break;
 
index e052833..b78b91c 100644 (file)
@@ -359,7 +359,7 @@ vke_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                return;
 
        count = 0;
-       while ((m = ifsq_dequeue(ifsq, NULL)) != NULL) {
+       while ((m = ifsq_dequeue(ifsq)) != NULL) {
                if (vke_txfifo_enqueue(sc, m) != -1) {
                        if (count++ == VKE_CHUNK) {
                                cothread_lock(cotd, 0);
index d9fdd7c..e234cb1 100644 (file)
@@ -213,7 +213,7 @@ altq_disable(struct ifaltq *ifq)
 #define        TBR_UNSCALE(x)  ((x) >> TBR_SHIFT)
 
 struct mbuf *
-tbr_dequeue(struct ifaltq_subque *ifsq, struct mbuf *mpolled, int op)
+tbr_dequeue(struct ifaltq_subque *ifsq, int op)
 {
        struct ifaltq *ifq = ifsq->ifsq_altq;
        struct tb_regulator *tbr;
@@ -255,14 +255,12 @@ tbr_dequeue(struct ifaltq_subque *ifsq, struct mbuf *mpolled, int op)
                }
        }
 
-       if (ifq_is_enabled(ifq)) {
-               m = (*ifsq->ifsq_dequeue)(ifsq, mpolled, op);
-       } else if (op == ALTDQ_POLL) {
+       if (ifq_is_enabled(ifq))
+               m = (*ifsq->ifsq_dequeue)(ifsq, NULL, op);
+       else if (op == ALTDQ_POLL)
                IF_POLL(ifsq, m);
-       } else {
+       else
                IF_DEQUEUE(ifsq, m);
-               KKASSERT(mpolled == NULL || mpolled == m);
-       }
 
        if (m != NULL && op == ALTDQ_REMOVE)
                tbr->tbr_token -= TBR_SCALE(m_pktlen(m));
index 8c9760a..a87b1c7 100644 (file)
@@ -204,7 +204,7 @@ int altq_attach(struct ifaltq *, int, void *, altq_mapsubq_t,
 int    altq_detach(struct ifaltq *);
 int    altq_enable(struct ifaltq *);
 int    altq_disable(struct ifaltq *);
-struct mbuf *tbr_dequeue(struct ifaltq_subque *, struct mbuf *, int);
+struct mbuf *tbr_dequeue(struct ifaltq_subque *, int);
 extern int     (*altq_input)(struct mbuf *, int);
 #endif /* _KERNEL */
 
index 7af7913..6d71d7d 100644 (file)
@@ -2305,7 +2305,7 @@ bridge_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                struct ether_header *eh;
                struct mbuf *m;
 
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                if (m == NULL)
                        break;
                mbuftrackid(m, 75);
index 59fc3c2..fdd738b 100644 (file)
@@ -214,7 +214,7 @@ ef_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
 
        EFDEBUG("\n");
        for (;;) {
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                if (m == NULL)
                        break;
 
index 6b4c52a..d5e1aea 100644 (file)
@@ -281,7 +281,7 @@ lo_altqstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        
        while (1) {
                crit_enter();
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                crit_exit();
                if (m == NULL)
                        return;
index b6219ff..27bd95a 100644 (file)
@@ -175,7 +175,7 @@ ifsq_enqueue(struct ifaltq_subque *_ifsq, struct mbuf *_m,
 }
 
 static __inline struct mbuf *
-ifsq_dequeue(struct ifaltq_subque *_ifsq, struct mbuf *_mpolled)
+ifsq_dequeue(struct ifaltq_subque *_ifsq)
 {
        struct mbuf *_m;
 
@@ -191,12 +191,12 @@ ifsq_dequeue(struct ifaltq_subque *_ifsq, struct mbuf *_mpolled)
 
 #ifdef ALTQ
        if (_ifsq->ifsq_altq->altq_tbr != NULL)
-               _m = tbr_dequeue(_ifsq, _mpolled, ALTDQ_REMOVE);
+               _m = tbr_dequeue(_ifsq, ALTDQ_REMOVE);
        else if (!ifq_is_enabled(_ifsq->ifsq_altq))
-               _m = ifsq_classic_dequeue(_ifsq, _mpolled, ALTDQ_REMOVE);
+               _m = ifsq_classic_dequeue(_ifsq, NULL, ALTDQ_REMOVE);
        else
 #endif
-       _m = _ifsq->ifsq_dequeue(_ifsq, _mpolled, ALTDQ_REMOVE);
+       _m = _ifsq->ifsq_dequeue(_ifsq, NULL, ALTDQ_REMOVE);
        ALTQ_SQ_UNLOCK(_ifsq);
        return _m;
 }
@@ -212,7 +212,7 @@ ifsq_poll_locked(struct ifaltq_subque *_ifsq)
 
 #ifdef ALTQ
        if (_ifsq->ifsq_altq->altq_tbr != NULL)
-               return tbr_dequeue(_ifsq, NULL, ALTDQ_POLL);
+               return tbr_dequeue(_ifsq, ALTDQ_POLL);
        else if (!ifq_is_enabled(_ifsq->ifsq_altq))
                return ifsq_classic_dequeue(_ifsq, NULL, ALTDQ_POLL);
        else
@@ -583,9 +583,9 @@ ifq_purge(struct ifaltq *_ifq)
 
 /* COMPAT */
 static __inline struct mbuf *
-ifq_dequeue(struct ifaltq *_ifq, struct mbuf *_mpolled)
+ifq_dequeue(struct ifaltq *_ifq)
 {
-       return ifsq_dequeue(ifq_get_subq_default(_ifq), _mpolled);
+       return ifsq_dequeue(ifq_get_subq_default(_ifq));
 }
 
 /* COMPAT */
index f00f045..4589168 100644 (file)
@@ -189,7 +189,7 @@ pflogstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        ASSERT_LWKT_TOKEN_HELD(&pf_token);
 
        for (;;) {
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                if (m == NULL)
                        return;
                else
index be70db4..0f80b14 100644 (file)
@@ -1010,7 +1010,7 @@ ppp_dequeue(struct ppp_softc *sc)
      */
     IF_DEQUEUE(&sc->sc_fastq, m);
     if (m == NULL)
-       m = ifsq_dequeue(ifq_get_subq_default(&sc->sc_if.if_snd), NULL);
+       m = ifsq_dequeue(ifq_get_subq_default(&sc->sc_if.if_snd));
     if (m == NULL)
        return NULL;
 
index 9e21886..57a1719 100644 (file)
@@ -580,7 +580,7 @@ slstart(struct tty *tp)
                if (m)
                        IFNET_STAT_INC(&sc->sc_if, omcasts, 1); /* XXX */
                else
-                       m = ifsq_dequeue(ifsq, NULL);
+                       m = ifsq_dequeue(ifsq);
                crit_exit();
                if (m == NULL) {
                        lwkt_reltoken(&tty_token);
index 7be21ba..718320a 100644 (file)
@@ -1108,7 +1108,7 @@ sppp_dequeue(struct ifnet *ifp)
                IF_DEQUEUE(&sp->pp_fastq, m);
                if (m == NULL) {
                        m = ifsq_dequeue(
-                           ifq_get_subq_default(&sp->pp_if.if_snd), NULL);
+                           ifq_get_subq_default(&sp->pp_if.if_snd));
                }
        }
 
index 113bf3a..abbcf88 100644 (file)
@@ -668,7 +668,7 @@ tapifstart(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        ifsq_set_oactive(ifsq);
 
        ifq = &tp->tap_devq;
-       while ((m = ifsq_dequeue(ifsq, NULL)) != NULL) {
+       while ((m = ifsq_dequeue(ifsq)) != NULL) {
                if (IF_QFULL(ifq)) {
                        IF_DROP(ifq);
                        IFNET_STAT_INC(ifp, oerrors, 1);
index d70ca9e..1328c8c 100644 (file)
@@ -551,7 +551,7 @@ tunread(struct dev_read_args *ap)
 
        ifnet_serialize_all(ifp);
 
-       while ((m0 = ifsq_dequeue(ifsq, NULL)) == NULL) {
+       while ((m0 = ifsq_dequeue(ifsq)) == NULL) {
                if (ap->a_ioflag & IO_NDELAY) {
                        ifnet_deserialize_all(ifp);
                        return EWOULDBLOCK;
index cd5a7e9..8a8fb08 100644 (file)
@@ -521,7 +521,7 @@ vlan_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        for (;;) {
                struct netmsg_packet *nmp;
 
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                if (m == NULL)
                        break;
                BPF_MTAP(ifp, m);
index 23072c2..a793568 100644 (file)
@@ -239,7 +239,7 @@ ng_eiface_start(struct ifnet *ifp, struct ifaltq_subque *ifsq __unused)
        /*
         * Grab a packet to transmit.
         */
-       m = ifq_dequeue(&ifp->if_snd, NULL);
+       m = ifq_dequeue(&ifp->if_snd);
 
        /* If there's nothing to send, return. */
        if(m == NULL)
index 8566cb2..2138a82 100644 (file)
@@ -989,7 +989,7 @@ ng_fec_start(struct ifnet *ifp, struct ifaltq_subque *ifsq __unused)
        priv = ifp->if_softc;
        b = &priv->fec_bundle;
 
-       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+       m0 = ifq_dequeue(&ifp->if_snd);
        if (m0 == NULL)
                return;
 
index 05c7dbd..4e251e6 100644 (file)
@@ -463,7 +463,7 @@ ng_iface_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        for(;;) {
                struct mbuf *m;
 
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
                if (m == NULL)
                        break;
                sa = *mtod(m, sa_family_t *);
index dbc2a4a..79710bc 100644 (file)
@@ -222,7 +222,7 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2)
                /*
                 * Grab a packet to transmit.
                 */
-               m = ifq_dequeue(&ifp->if_snd, NULL);
+               m = ifq_dequeue(&ifp->if_snd);
 
                /* If there's nothing to send, break. */
                if (m == NULL)
index 97c9c51..cdd96f9 100644 (file)
@@ -1123,7 +1123,7 @@ ng_fec_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
        priv = ifp->if_softc;
        b = &priv->fec_bundle;
 
-       m0 = ifq_dequeue(&ifp->if_snd, NULL);
+       m0 = ifq_dequeue(&ifp->if_snd);
        if (m0 == NULL)
                return;
 
index b720cec..5b02b20 100644 (file)
@@ -161,7 +161,7 @@ ieee80211_start(struct ifnet *ifp, struct ifaltq_subque *ifsq)
                }
        }
        for (;;) {
-               m = ifsq_dequeue(ifsq, NULL);
+               m = ifsq_dequeue(ifsq);
                if (m == NULL)
                        break;
                /*