One kill a day, keeps...
So, here's a diff that replaces these two macros by their IFQ_*
equivalent and kill them. No object change.
ok?
Index: dev/ic/ar5008.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ic/ar5008.c,v
retrieving revision 1.23
diff -u -p -r1.23 ar5008.c
--- dev/ic/ar5008.c 7 Aug 2013 01:06:28 -0000 1.23
+++ dev/ic/ar5008.c 22 Nov 2013 08:50:14 -0000
@@ -1062,7 +1062,7 @@ ar5008_swba_intr(struct athn_softc *sc)
int error, totlen;
if (ic->ic_tim_mcast_pending &&
- IF_IS_EMPTY(&ni->ni_savedq) &&
+ IFQ_IS_EMPTY(&ni->ni_savedq) &&
SIMPLEQ_EMPTY(&sc->txq[ATHN_QID_CAB].head))
ic->ic_tim_mcast_pending = 0;
@@ -1146,7 +1146,7 @@ ar5008_swba_intr(struct athn_softc *sc)
IF_DEQUEUE(&ni->ni_savedq, m);
if (m == NULL)
break;
- if (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
/* more queued frames, set the more data bit */
wh = mtod(m, struct ieee80211_frame *);
wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
Index: dev/ic/ar9003.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ic/ar9003.c,v
retrieving revision 1.27
diff -u -p -r1.27 ar9003.c
--- dev/ic/ar9003.c 7 Aug 2013 01:06:28 -0000 1.27
+++ dev/ic/ar9003.c 22 Nov 2013 08:50:14 -0000
@@ -1194,7 +1194,7 @@ ar9003_swba_intr(struct athn_softc *sc)
int error, totlen;
if (ic->ic_tim_mcast_pending &&
- IF_IS_EMPTY(&ni->ni_savedq) &&
+ IFQ_IS_EMPTY(&ni->ni_savedq) &&
SIMPLEQ_EMPTY(&sc->txq[ATHN_QID_CAB].head))
ic->ic_tim_mcast_pending = 0;
@@ -1290,7 +1290,7 @@ ar9003_swba_intr(struct athn_softc *sc)
IF_DEQUEUE(&ni->ni_savedq, m);
if (m == NULL)
break;
- if (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
/* more queued frames, set the more data bit */
wh = mtod(m, struct ieee80211_frame *);
wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
Index: dev/ic/rtw.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ic/rtw.c,v
retrieving revision 1.82
diff -u -p -r1.82 rtw.c
--- dev/ic/rtw.c 5 Dec 2012 23:20:19 -0000 1.82
+++ dev/ic/rtw.c 22 Nov 2013 08:50:14 -0000
@@ -2700,7 +2700,7 @@ rtw_80211_dequeue(struct rtw_softc *sc,
{
struct mbuf *m;
- if (IF_IS_EMPTY(ifq))
+ if (IFQ_IS_EMPTY(ifq))
return NULL;
if (rtw_txring_choose(sc, tsbp, tdbp, pri) == -1) {
DPRINTF(sc, RTW_DEBUG_XMIT_RSRC, ("%s: no ring %d descriptor\n",
Index: dev/pci/if_de.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pci/if_de.c,v
retrieving revision 1.111
diff -u -p -r1.111 if_de.c
--- dev/pci/if_de.c 7 Aug 2013 01:06:34 -0000 1.111
+++ dev/pci/if_de.c 22 Nov 2013 08:50:14 -0000
@@ -3204,7 +3204,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
bus_dmamap_t map;
int error;
- if (fillok && IF_LEN(&sc->tulip_rxq) < TULIP_RXQ_TARGET)
+ if (fillok && IFQ_LEN(&sc->tulip_rxq) < TULIP_RXQ_TARGET)
goto queue_mbuf;
#if defined(TULIP_DEBUG)
@@ -3225,7 +3225,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
TULIP_RXDESC_POSTSYNC(sc, eop, sizeof(*eop));
if ((((volatile tulip_desc_t *) eop)->d_status &
(TULIP_DSTS_OWNER|TULIP_DSTS_RxFIRSTDESC|TULIP_DSTS_RxLASTDESC)) ==
(TULIP_DSTS_RxFIRSTDESC|TULIP_DSTS_RxLASTDESC)) {
#ifdef DIAGNOSTIC
- if (IF_IS_EMPTY(&sc->tulip_rxq))
+ if (IFQ_IS_EMPTY(&sc->tulip_rxq))
panic("%s: tulip_rxq empty", sc->tulip_if.if_xname);
#endif
IF_DEQUEUE(&sc->tulip_rxq, ms);
@@ -3461,7 +3461,7 @@ tulip_rx_intr(tulip_softc_t * const sc)
IF_ENQUEUE(&sc->tulip_rxq, ms);
} while ((ms = me) != NULL);
- if (IF_LEN(&sc->tulip_rxq) >= TULIP_RXQ_TARGET)
+ if (IFQ_LEN(&sc->tulip_rxq) >= TULIP_RXQ_TARGET)
sc->tulip_flags &= ~TULIP_RXBUFSLOW;
TULIP_PERFEND(rxget);
}
@@ -3894,7 +3894,7 @@ tulip_txput(tulip_softc_t * const sc, st
struct mbuf *tmp;
if (!notonqueue) {
#ifdef DIAGNOSTIC
- if (IF_IS_EMPTY(&ifp->if_snd))
+ if (IFQ_IS_EMPTY(&ifp->if_snd))
panic("%s: if_snd queue empty", ifp->if_xname);
#endif
IFQ_DEQUEUE(&ifp->if_snd, tmp);
@@ -3978,7 +3978,7 @@ tulip_txput(tulip_softc_t * const sc, st
/* remove the mbuf from the queue */
struct mbuf *tmp;
#ifdef DIAGNOSTIC
- if (IF_IS_EMPTY(&ifp->if_snd))
+ if (IFQ_IS_EMPTY(&ifp->if_snd))
panic("%s: if_snd queue empty", ifp->if_xname);
#endif
IFQ_DEQUEUE(&ifp->if_snd, tmp);
Index: dev/pci/if_lmc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pci/if_lmc.c,v
retrieving revision 1.25
diff -u -p -r1.25 if_lmc.c
--- dev/pci/if_lmc.c 7 Jul 2011 20:42:56 -0000 1.25
+++ dev/pci/if_lmc.c 22 Nov 2013 08:50:14 -0000
@@ -507,7 +507,7 @@ lmc_rx_intr(lmc_softc_t * const sc)
bus_dmamap_t map;
int error;
- if (fillok && IF_LEN(&sc->lmc_rxq) < LMC_RXQ_TARGET)
+ if (fillok && IFQ_LEN(&sc->lmc_rxq) < LMC_RXQ_TARGET)
goto queue_mbuf;
/*
@@ -737,7 +737,7 @@ lmc_rx_intr(lmc_softc_t * const sc)
IF_ENQUEUE(&sc->lmc_rxq, ms);
} while ((ms = me) != NULL);
- if (IF_LEN(&sc->lmc_rxq) >= LMC_RXQ_TARGET)
+ if (IFQ_LEN(&sc->lmc_rxq) >= LMC_RXQ_TARGET)
sc->lmc_flags &= ~LMC_RXBUFSLOW;
}
}
Index: dev/pci/if_san_xilinx.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pci/if_san_xilinx.c,v
retrieving revision 1.28
diff -u -p -r1.28 if_san_xilinx.c
--- dev/pci/if_san_xilinx.c 7 Aug 2013 01:06:37 -0000 1.28
+++ dev/pci/if_san_xilinx.c 22 Nov 2013 08:50:14 -0000
@@ -853,7 +853,7 @@ process_udp_mgmt_pkt(sdla_t* card, struc
wan_udp_pkt->wan_udp_aft_num_frames = 0;
wan_udp_pkt->wan_udp_aft_ismoredata = 0;
- while (!IF_IS_EMPTY(&trace_info->ifq)) {
+ while (!IFQ_IS_EMPTY(&trace_info->ifq)) {
IF_POLL(&trace_info->ifq, m0);
if (m0 == NULL) {
log(LOG_INFO, "%s: No more "
Index: dev/sdmmc/sbt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/sdmmc/sbt.c,v
retrieving revision 1.17
diff -u -p -r1.17 sbt.c
--- dev/sdmmc/sbt.c 24 Aug 2010 14:52:23 -0000 1.17
+++ dev/sdmmc/sbt.c 22 Nov 2013 08:50:14 -0000
@@ -469,7 +469,7 @@ sbt_start(struct sbt_softc *sc, struct m
if (m != NULL)
IF_ENQUEUE(q, m);
- if (sc->sc_dying || IF_IS_EMPTY(q)) {
+ if (sc->sc_dying || IFQ_IS_EMPTY(q)) {
splx(s);
return;
}
Index: dev/usb/ubt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/ubt.c,v
retrieving revision 1.25
diff -u -p -r1.25 ubt.c
--- dev/usb/ubt.c 6 Nov 2013 17:04:47 -0000 1.25
+++ dev/usb/ubt.c 22 Nov 2013 08:50:14 -0000
@@ -891,7 +891,7 @@ ubt_xmit_cmd_start(struct ubt_softc *sc)
if (usbd_is_dying(sc->sc_udev))
return;
- if (IF_IS_EMPTY(&sc->sc_cmd_queue))
+ if (IFQ_IS_EMPTY(&sc->sc_cmd_queue))
return;
IF_DEQUEUE(&sc->sc_cmd_queue, m);
@@ -998,7 +998,7 @@ ubt_xmit_acl_start(struct ubt_softc *sc)
if (usbd_is_dying(sc->sc_udev))
return;
- if (IF_IS_EMPTY(&sc->sc_aclwr_queue))
+ if (IFQ_IS_EMPTY(&sc->sc_aclwr_queue))
return;
sc->sc_refcnt++;
Index: net/if_pppx.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_pppx.c,v
retrieving revision 1.26
diff -u -p -r1.26 if_pppx.c
--- net/if_pppx.c 19 Oct 2013 14:46:30 -0000 1.26
+++ net/if_pppx.c 22 Nov 2013 08:50:14 -0000
@@ -479,7 +479,7 @@ pppxpoll(dev_t dev, int events, struct p
if (events & (POLLIN | POLLRDNORM)) {
s = splnet();
- if (!IF_IS_EMPTY(&pxd->pxd_svcq))
+ if (!IFQ_IS_EMPTY(&pxd->pxd_svcq))
revents |= events & (POLLIN | POLLRDNORM);
splx(s);
}
@@ -551,9 +551,9 @@ filt_pppx_read(struct knote *kn, long hi
}
s = splnet();
- if (!IF_IS_EMPTY(&pxd->pxd_svcq)) {
+ if (!IFQ_IS_EMPTY(&pxd->pxd_svcq)) {
event = 1;
- kn->kn_data = IF_LEN(&pxd->pxd_svcq);
+ kn->kn_data = IFQ_LEN(&pxd->pxd_svcq);
}
splx(s);
Index: net/if_spppsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_spppsubr.c,v
retrieving revision 1.113
diff -u -p -r1.113 if_spppsubr.c
--- net/if_spppsubr.c 20 Nov 2013 08:21:33 -0000 1.113
+++ net/if_spppsubr.c 22 Nov 2013 08:50:14 -0000
@@ -950,7 +950,7 @@ sppp_isempty(struct ifnet *ifp)
int empty, s;
s = splnet();
- empty = IF_IS_EMPTY(&sp->pp_cpq) &&
+ empty = IFQ_IS_EMPTY(&sp->pp_cpq) &&
IFQ_IS_EMPTY(&sp->pp_if.if_snd);
splx(s);
return (empty);
Index: net/if_var.h
===================================================================
RCS file: /home/ncvs/src/sys/net/if_var.h,v
retrieving revision 1.1
diff -u -p -r1.1 if_var.h
--- net/if_var.h 21 Nov 2013 17:32:12 -0000 1.1
+++ net/if_var.h 22 Nov 2013 08:50:14 -0000
@@ -268,8 +268,6 @@ do {
\
m_freem(__m0); \
} \
} while (/* CONSTCOND */0)
-#define IF_LEN(ifq) ((ifq)->ifq_len)
-#define IF_IS_EMPTY(ifq) ((ifq)->ifq_len == 0)
#define IFQ_MAXLEN 256
#define IFNET_SLOWHZ 1 /* granularity is 1 second */
@@ -449,7 +447,7 @@ do {
\
#endif /* ALTQ */
-#define IFQ_LEN(ifq) IF_LEN(ifq)
+#define IFQ_LEN(ifq) ((ifq)->ifq_len)
#define IFQ_IS_EMPTY(ifq) ((ifq)->ifq_len == 0)
#define IFQ_INC_LEN(ifq) ((ifq)->ifq_len++)
#define IFQ_DEC_LEN(ifq) (--(ifq)->ifq_len)
Index: net/pipex.c
===================================================================
RCS file: /home/ncvs/src/sys/net/pipex.c,v
retrieving revision 1.48
diff -u -p -r1.48 pipex.c
--- net/pipex.c 11 Nov 2013 09:15:34 -0000 1.48
+++ net/pipex.c 22 Nov 2013 08:50:14 -0000
@@ -768,7 +768,7 @@ pipex_ppp_dequeue(void)
* to re-schedule software interrupt.
*/
s = splnet();
- if (!IF_IS_EMPTY(&pipexinq) || !IF_IS_EMPTY(&pipexoutq))
+ if (!IFQ_IS_EMPTY(&pipexinq) || !IFQ_IS_EMPTY(&pipexoutq))
softintr_schedule(pipex_softintr);
splx(s);
}
@@ -867,7 +867,7 @@ pipex_timer(void *ignored_arg)
* mbuf queued in pipexinq or pipexoutq may have a
* refererce to this session.
*/
- if (!IF_IS_EMPTY(&pipexinq) || !IF_IS_EMPTY(&pipexoutq))
+ if (!IFQ_IS_EMPTY(&pipexinq) ||
!IFQ_IS_EMPTY(&pipexoutq))
continue;
pipex_destroy_session(session);
Index: net/ppp_tty.c
===================================================================
RCS file: /home/ncvs/src/sys/net/ppp_tty.c,v
retrieving revision 1.26
diff -u -p -r1.26 ppp_tty.c
--- net/ppp_tty.c 28 Mar 2013 23:10:05 -0000 1.26
+++ net/ppp_tty.c 22 Nov 2013 08:50:14 -0000
@@ -304,7 +304,7 @@ pppread(struct tty *tp, struct uio *uio,
splx(s);
return 0;
}
- if (!IF_IS_EMPTY(&sc->sc_inq))
+ if (!IFQ_IS_EMPTY(&sc->sc_inq))
break;
if ((tp->t_state & TS_CARR_ON) == 0 && (tp->t_cflag & CLOCAL) == 0
&& (tp->t_state & TS_ISOPEN)) {
Index: net80211/ieee80211_input.c
===================================================================
RCS file: /home/ncvs/src/sys/net80211/ieee80211_input.c,v
retrieving revision 1.123
diff -u -p -r1.123 ieee80211_input.c
--- net80211/ieee80211_input.c 11 Jun 2013 18:15:53 -0000 1.123
+++ net80211/ieee80211_input.c 22 Nov 2013 08:50:14 -0000
@@ -326,7 +326,7 @@ ieee80211_input(struct ifnet *ifp, struc
(*ic->ic_set_tim)(ic, ni->ni_associd, 0);
/* dequeue buffered unicast frames */
- while (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ while (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
struct mbuf *m;
IF_DEQUEUE(&ni->ni_savedq, m);
IF_ENQUEUE(&ic->ic_pwrsaveq, m);
@@ -2821,7 +2821,7 @@ ieee80211_recv_pspoll(struct ieee80211co
IF_DEQUEUE(&ni->ni_savedq, m);
if (m == NULL)
return;
- if (IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (IFQ_IS_EMPTY(&ni->ni_savedq)) {
/* last queued frame, turn off the TIM bit */
(*ic->ic_set_tim)(ic, ni->ni_associd, 0);
} else {
Index: net80211/ieee80211_node.c
===================================================================
RCS file: /home/ncvs/src/sys/net80211/ieee80211_node.c,v
retrieving revision 1.79
diff -u -p -r1.79 ieee80211_node.c
--- net80211/ieee80211_node.c 21 Nov 2013 16:16:08 -0000 1.79
+++ net80211/ieee80211_node.c 22 Nov 2013 08:50:14 -0000
@@ -1091,7 +1091,7 @@ ieee80211_free_node(struct ieee80211com
RB_REMOVE(ieee80211_tree, &ic->ic_tree, ni);
ic->ic_nnodes--;
#ifndef IEEE80211_STA_ONLY
- if (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
IF_PURGE(&ni->ni_savedq);
if (ic->ic_set_tim != NULL)
(*ic->ic_set_tim)(ic, ni->ni_associd, 0);
@@ -1607,7 +1607,7 @@ ieee80211_node_leave(struct ieee80211com
ni->ni_pwrsave = IEEE80211_PS_AWAKE;
}
- if (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
IF_PURGE(&ni->ni_savedq);
if (ic->ic_set_tim != NULL)
(*ic->ic_set_tim)(ic, ni->ni_associd, 0);
@@ -1772,7 +1772,7 @@ ieee80211_notify_dtim(struct ieee80211co
IF_DEQUEUE(&ni->ni_savedq, m);
if (m == NULL)
break;
- if (!IF_IS_EMPTY(&ni->ni_savedq)) {
+ if (!IFQ_IS_EMPTY(&ni->ni_savedq)) {
/* more queued frames, set the more data bit */
wh = mtod(m, struct ieee80211_frame *);
wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA;
Index: net80211/ieee80211_output.c
===================================================================
RCS file: /home/ncvs/src/sys/net80211/ieee80211_output.c,v
retrieving revision 1.88
diff -u -p -r1.88 ieee80211_output.c
--- net80211/ieee80211_output.c 17 Jul 2010 16:30:01 -0000 1.88
+++ net80211/ieee80211_output.c 22 Nov 2013 08:50:14 -0000
@@ -1901,7 +1901,7 @@ ieee80211_pwrsave(struct ieee80211com *i
(wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) ==
IEEE80211_FC0_TYPE_CTL)
return 0;
- if (IF_IS_EMPTY(&ni->ni_savedq))
+ if (IFQ_IS_EMPTY(&ni->ni_savedq))
(*ic->ic_set_tim)(ic, ni->ni_associd, 1);
}
/* NB: ni == ic->ic_bss for broadcast/multicast */
Index: netbt/hci_link.c
===================================================================
RCS file: /home/ncvs/src/sys/netbt/hci_link.c,v
retrieving revision 1.11
diff -u -p -r1.11 hci_link.c
--- netbt/hci_link.c 29 Jul 2010 14:40:47 -0000 1.11
+++ netbt/hci_link.c 22 Nov 2013 08:50:14 -0000
@@ -625,7 +625,7 @@ hci_acl_start(struct hci_link *link)
if (pdu == NULL)
return;
- if (!IF_IS_EMPTY(&pdu->lp_data))
+ if (!IFQ_IS_EMPTY(&pdu->lp_data))
break;
pdu = TAILQ_NEXT(pdu, lp_next);
@@ -656,7 +656,7 @@ hci_acl_start(struct hci_link *link)
hci_output_acl(unit, m);
- if (IF_IS_EMPTY(&pdu->lp_data)) {
+ if (IFQ_IS_EMPTY(&pdu->lp_data)) {
if (pdu->lp_chan) {
/*
* This should enable streaming of PDUs - when
@@ -715,7 +715,7 @@ hci_acl_complete(struct hci_link *link,
num -= pdu->lp_pending;
pdu->lp_pending = 0;
- if (IF_IS_EMPTY(&pdu->lp_data)) {
+ if (IFQ_IS_EMPTY(&pdu->lp_data)) {
TAILQ_REMOVE(&link->hl_txq, pdu, lp_next);
chan = pdu->lp_chan;
if (chan != NULL) {
Index: netbt/hci_unit.c
===================================================================
RCS file: /home/ncvs/src/sys/netbt/hci_unit.c,v
retrieving revision 1.12
diff -u -p -r1.12 hci_unit.c
--- netbt/hci_unit.c 6 Jul 2011 02:42:28 -0000 1.12
+++ netbt/hci_unit.c 22 Nov 2013 08:50:14 -0000
@@ -585,7 +585,7 @@ hci_num_cmds(struct hci_unit *unit, uint
unit->hci_num_cmd_pkts = num;
- while (unit->hci_num_cmd_pkts > 0 && !IF_IS_EMPTY(&unit->hci_cmdwait)) {
+ while (unit->hci_num_cmd_pkts > 0 && !IFQ_IS_EMPTY(&unit->hci_cmdwait))
{
IF_DEQUEUE(&unit->hci_cmdwait, m);
hci_output_cmd(unit, m);
}
Index: netbt/l2cap_lower.c
===================================================================
RCS file: /home/ncvs/src/sys/netbt/l2cap_lower.c,v
retrieving revision 1.3
diff -u -p -r1.3 l2cap_lower.c
--- netbt/l2cap_lower.c 22 Nov 2008 04:42:58 -0000 1.3
+++ netbt/l2cap_lower.c 22 Nov 2013 08:50:14 -0000
@@ -162,7 +162,7 @@ l2cap_start(struct l2cap_channel *chan)
if (chan->lc_state != L2CAP_OPEN)
return 0;
- if (IF_IS_EMPTY(&chan->lc_txq)) {
+ if (IFQ_IS_EMPTY(&chan->lc_txq)) {
DPRINTFN(5, "no data, pending = %d\n", chan->lc_pending);
/*
* If we are just waiting for the queue to flush
Index: netbt/l2cap_upper.c
===================================================================
RCS file: /home/ncvs/src/sys/netbt/l2cap_upper.c,v
retrieving revision 1.6
diff -u -p -r1.6 l2cap_upper.c
--- netbt/l2cap_upper.c 6 Jan 2013 22:06:54 -0000 1.6
+++ netbt/l2cap_upper.c 22 Nov 2013 08:50:14 -0000
@@ -241,7 +241,7 @@ l2cap_disconnect(struct l2cap_channel *c
* no need to do anything unless the queue is empty or
* we are not lingering..
*/
- if ((IF_IS_EMPTY(&chan->lc_txq) && chan->lc_pending == 0)
+ if ((IFQ_IS_EMPTY(&chan->lc_txq) && chan->lc_pending == 0)
|| linger == 0) {
chan->lc_state = L2CAP_WAIT_DISCONNECT;
err = l2cap_send_disconnect_req(chan);
