[NET]: Transform skb_queue_len() binary tests into skb_queue_empty()

This is part of the grand scheme to eliminate the qlen
member of skb_queue_head, and subsequently remove the
'list' member of sk_buff.

Most users of skb_queue_len() want to know if the queue is
empty or not, and that's trivially done with skb_queue_empty()
which doesn't use the skb_queue_head->qlen member and instead
uses the queue list emptyness as the test.

Signed-off-by: David S. Miller <davem@davemloft.net>

15 files changed, 38 insertions, 37 deletions

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 3256192dcde8..f9b956fb2b8b 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -120,7 +120,7 @@ static unsigned int hci_vhci_chr_poll(struct file *file, poll_table * wait)
 
         poll_wait(file, &hci_vhci->read_wait, wait);
  
-        if (skb_queue_len(&hci_vhci->readq))
+        if (!skb_queue_empty(&hci_vhci->readq))
                 return POLLIN | POLLRDNORM;
 
         return POLLOUT | POLLWRNORM;
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
index ac899503a74f..bab356886483 100644
--- a/drivers/isdn/hisax/isdnl1.c
+++ b/drivers/isdn/hisax/isdnl1.c
@@ -279,7 +279,8 @@ BChannel_proc_xmt(struct BCState *bcs)
         if (test_and_clear_bit(FLG_L1_PULL_REQ, &st->l1.Flags))
                 st->l1.l1l2(st, PH_PULL | CONFIRM, NULL);
         if (!test_bit(BC_FLG_ACTIV, &bcs->Flag)) {
-                if (!test_bit(BC_FLG_BUSY, &bcs->Flag) && (!skb_queue_len(&bcs->squeue))) {
+                if (!test_bit(BC_FLG_BUSY, &bcs->Flag) &&
+                    skb_queue_empty(&bcs->squeue)) {
                         st->l2.l2l1(st, PH_DEACTIVATE | CONFIRM, NULL);
                 }
         }
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 9022583fd6a0..1615c1a76ab8 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -108,7 +108,8 @@ static int l2addrsize(struct Layer2 *l2);
 static void
 set_peer_busy(struct Layer2 *l2) {
         test_and_set_bit(FLG_PEER_BUSY, &l2->flag);
-        if (skb_queue_len(&l2->i_queue) || skb_queue_len(&l2->ui_queue))
+        if (!skb_queue_empty(&l2->i_queue) ||
+            !skb_queue_empty(&l2->ui_queue))
                 test_and_set_bit(FLG_L2BLOCK, &l2->flag);
 }
 
@@ -754,7 +755,7 @@ l2_restart_multi(struct FsmInst *fi, int event, void *arg)
                 st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL);
 
         if ((ST_L2_7==state) || (ST_L2_8 == state))
-                if (skb_queue_len(&st->l2.i_queue) && cansend(st))
+                if (!skb_queue_empty(&st->l2.i_queue) && cansend(st))
                         st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
 }
 
@@ -810,7 +811,7 @@ l2_connected(struct FsmInst *fi, int event, void *arg)
         if (pr != -1)
                 st->l2.l2l3(st, pr, NULL);
 
-        if (skb_queue_len(&st->l2.i_queue) && cansend(st))
+        if (!skb_queue_empty(&st->l2.i_queue) && cansend(st))
                 st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
 }
 
@@ -1014,7 +1015,7 @@ l2_st7_got_super(struct FsmInst *fi, int event, void *arg)
                         if(typ != RR) FsmDelTimer(&st->l2.t203, 9);
                         restart_t200(st, 12);
                 }
-                if (skb_queue_len(&st->l2.i_queue) && (typ == RR))
+                if (!skb_queue_empty(&st->l2.i_queue) && (typ == RR))
                         st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
         } else
                 nrerrorrecovery(fi);
@@ -1120,7 +1121,7 @@ l2_got_iframe(struct FsmInst *fi, int event, void *arg)
                 return;
         }
 
-        if (skb_queue_len(&st->l2.i_queue) && (fi->state == ST_L2_7))
+        if (!skb_queue_empty(&st->l2.i_queue) && (fi->state == ST_L2_7))
                 st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
         if (test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag))
                 enquiry_cr(st, RR, RSP, 0);
@@ -1138,7 +1139,7 @@ l2_got_tei(struct FsmInst *fi, int event, void *arg)
                 test_and_set_bit(FLG_L3_INIT, &st->l2.flag);
         } else
                 FsmChangeState(fi, ST_L2_4);
-        if (skb_queue_len(&st->l2.ui_queue))
+        if (!skb_queue_empty(&st->l2.ui_queue))
                 tx_ui(st);
 }
 
@@ -1301,7 +1302,7 @@ l2_pull_iqueue(struct FsmInst *fi, int event, void *arg)
                 FsmDelTimer(&st->l2.t203, 13);
                 FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 11);
         }
-        if (skb_queue_len(&l2->i_queue) && cansend(st))
+        if (!skb_queue_empty(&l2->i_queue) && cansend(st))
                 st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
 }
 
@@ -1347,7 +1348,7 @@ l2_st8_got_super(struct FsmInst *fi, int event, void *arg)
                         }
                         invoke_retransmission(st, nr);
                         FsmChangeState(fi, ST_L2_7);
-                        if (skb_queue_len(&l2->i_queue) && cansend(st))
+                        if (!skb_queue_empty(&l2->i_queue) && cansend(st))
                                 st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
                 } else
                         nrerrorrecovery(fi);
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index abcc9530eb34..c9917cd2132b 100644
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -302,7 +302,7 @@ release_l3_process(struct l3_process *p)
                                 !test_bit(FLG_PTP, &p->st->l2.flag)) {
                                 if (p->debug)
                                         l3_debug(p->st, "release_l3_process: last process");
-                                if (!skb_queue_len(&p->st->l3.squeue)) {
+                                if (skb_queue_empty(&p->st->l3.squeue)) {
                                         if (p->debug)
                                                 l3_debug(p->st, "release_l3_process: release link");
                                         if (p->st->protocol != ISDN_PTYPE_NI1)
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index ad5aa38fb5a6..b37ef1f06b3d 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1223,7 +1223,7 @@ isdn_tty_write(struct tty_struct *tty, const u_char * buf, int count)
                 total += c;
         }
         atomic_dec(&info->xmit_lock);
-        if ((info->xmit_count) || (skb_queue_len(&info->xmit_queue))) {
+        if ((info->xmit_count) || !skb_queue_empty(&info->xmit_queue)) {
                 if (m->mdmreg[REG_DXMT] & BIT_DXMT) {
                         isdn_tty_senddown(info);
                         isdn_tty_tint(info);
@@ -1284,7 +1284,7 @@ isdn_tty_flush_chars(struct tty_struct *tty)
 
         if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_flush_chars"))
                 return;
-        if ((info->xmit_count) || (skb_queue_len(&info->xmit_queue)))
+        if ((info->xmit_count) || !skb_queue_empty(&info->xmit_queue))
                 isdn_timer_ctrl(ISDN_TIMER_MODEMXMIT, 1);
 }
 
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 9fc0c1e03732..e0d1b01cc74c 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -304,12 +304,12 @@ icn_pollbchan_send(int channel, icn_card * card)
         isdn_ctrl cmd;
 
         if (!(card->sndcount[channel] || card->xskb[channel] ||
-              skb_queue_len(&card->spqueue[channel])))
+              !skb_queue_empty(&card->spqueue[channel])))
                 return;
         if (icn_trymaplock_channel(card, mch)) {
                 while (sbfree && 
                        (card->sndcount[channel] ||
-                        skb_queue_len(&card->spqueue[channel]) ||
+                        !skb_queue_empty(&card->spqueue[channel]) ||
                         card->xskb[channel])) {
                         spin_lock_irqsave(&card->lock, flags);
                         if (card->xmit_lock[channel]) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index ece1b1a13186..c27e417f32bf 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -304,7 +304,7 @@ static inline void scc_discard_buffers(struct scc_channel *scc)
                 scc->tx_buff = NULL;
         }
         
-        while (skb_queue_len(&scc->tx_queue))
+        while (!skb_queue_empty(&scc->tx_queue))
                 dev_kfree_skb(skb_dequeue(&scc->tx_queue));
 
         spin_unlock_irqrestore(&scc->lock, flags);
@@ -1126,8 +1126,7 @@ static void t_dwait(unsigned long channel)
         
         if (scc->stat.tx_state == TXS_WAIT)     /* maxkeyup or idle timeout */
         {
-                if (skb_queue_len(&scc->tx_queue) == 0) /* nothing to send */
-                {
+                if (skb_queue_empty(&scc->tx_queue)) {  /* nothing to send */
                         scc->stat.tx_state = TXS_IDLE;
                         netif_wake_queue(scc->dev);     /* t_maxkeyup locked it. */
                         return;
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 5e48b9ab3045..59e8183c639e 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -364,7 +364,7 @@ ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf,
         spin_lock_irqsave(&ap->recv_lock, flags);
         ppp_async_input(ap, buf, cflags, count);
         spin_unlock_irqrestore(&ap->recv_lock, flags);
-        if (skb_queue_len(&ap->rqueue))
+        if (!skb_queue_empty(&ap->rqueue))
                 tasklet_schedule(&ap->tsk);
         ap_put(ap);
         if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index ab726ab43798..a32668e88e09 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1237,8 +1237,8 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
                 pch = list_entry(list, struct channel, clist);
                 navail += pch->avail = (pch->chan != NULL);
                 if (pch->avail) {
-                        if (skb_queue_len(&pch->file.xq) == 0
-                            || !pch->had_frag) {
+                        if (skb_queue_empty(&pch->file.xq) ||
+                            !pch->had_frag) {
                                 pch->avail = 2;
                                 ++nfree;
                         }
@@ -1374,8 +1374,8 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
 
                 /* try to send it down the channel */
                 chan = pch->chan;
-                if (skb_queue_len(&pch->file.xq)
-                    || !chan->ops->start_xmit(chan, frag))
+                if (!skb_queue_empty(&pch->file.xq) ||
+                    !chan->ops->start_xmit(chan, frag))
                         skb_queue_tail(&pch->file.xq, frag);
                 pch->had_frag = 1;
                 p += flen;
@@ -1412,7 +1412,7 @@ ppp_channel_push(struct channel *pch)
 
         spin_lock_bh(&pch->downl);
         if (pch->chan != 0) {
-                while (skb_queue_len(&pch->file.xq) > 0) {
+                while (!skb_queue_empty(&pch->file.xq)) {
                         skb = skb_dequeue(&pch->file.xq);
                         if (!pch->chan->ops->start_xmit(pch->chan, skb)) {
                                 /* put the packet back and try again later */
@@ -1426,7 +1426,7 @@ ppp_channel_push(struct channel *pch)
         }
         spin_unlock_bh(&pch->downl);
         /* see if there is anything from the attached unit to be sent */
-        if (skb_queue_len(&pch->file.xq) == 0) {
+        if (skb_queue_empty(&pch->file.xq)) {
                 read_lock_bh(&pch->upl);
                 ppp = pch->ppp;
                 if (ppp != 0)
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index fd9f50180355..4d51c0c8023d 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -406,7 +406,7 @@ ppp_sync_receive(struct tty_struct *tty, const unsigned char *buf,
         spin_lock_irqsave(&ap->recv_lock, flags);
         ppp_sync_input(ap, buf, cflags, count);
         spin_unlock_irqrestore(&ap->recv_lock, flags);
-        if (skb_queue_len(&ap->rqueue))
+        if (!skb_queue_empty(&ap->rqueue))
                 tasklet_schedule(&ap->tsk);
         sp_put(ap);
         if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7bfee366297b..effab0b9adca 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -215,7 +215,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)
 
         poll_wait(file, &tun->read_wait, wait);
  
-        if (skb_queue_len(&tun->readq))
+        if (!skb_queue_empty(&tun->readq))
                 mask |= POLLIN | POLLRDNORM;
 
         return mask;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index c12648d8192b..47f3c5d0203d 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2374,7 +2374,7 @@ void stop_airo_card( struct net_device *dev, int freeres )
         /*
          * Clean out tx queue
          */
-        if (test_bit(FLAG_MPI, &ai->flags) && skb_queue_len (&ai->txq) > 0) {
+        if (test_bit(FLAG_MPI, &ai->flags) && !skb_queue_empty(&ai->txq)) {
                 struct sk_buff *skb = NULL;
                 for (;(skb = skb_dequeue(&ai->txq));)
                         dev_kfree_skb(skb);
@@ -3287,7 +3287,7 @@ exitrx:
                                 if (status & EV_TXEXC)
                                         get_tx_error(apriv, -1);
                                 spin_lock_irqsave(&apriv->aux_lock, flags);
-                                if (skb_queue_len (&apriv->txq)) {
+                                if (!skb_queue_empty(&apriv->txq)) {
                                         spin_unlock_irqrestore(&apriv->aux_lock,flags);
                                         mpi_send_packet (dev);
                                 } else {
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 60440dbe3a27..24c0af49c25c 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -428,7 +428,7 @@ claw_pack_skb(struct claw_privbk *privptr)
         new_skb = NULL;         /* assume no dice */
         pkt_cnt = 0;
         CLAW_DBF_TEXT(4,trace,"PackSKBe");
-        if (skb_queue_len(&p_ch->collect_queue) > 0) {
+        if (!skb_queue_empty(&p_ch->collect_queue)) {
         /* some data */
                 held_skb = skb_dequeue(&p_ch->collect_queue);
                 if (p_env->packing != DO_PACKED)
@@ -1254,7 +1254,7 @@ claw_write_next ( struct chbk * p_ch )
         privptr = (struct claw_privbk *) dev->priv;
         claw_free_wrt_buf( dev );
         if ((privptr->write_free_count > 0) &&
-            (skb_queue_len(&p_ch->collect_queue) > 0)) {
+            !skb_queue_empty(&p_ch->collect_queue)) {
                 pk_skb = claw_pack_skb(privptr);
                 while (pk_skb != NULL) {
                         rc = claw_hw_tx( pk_skb, dev,1);
diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c
index 3080393e823d..968f2c113efe 100644
--- a/drivers/s390/net/ctctty.c
+++ b/drivers/s390/net/ctctty.c
@@ -156,7 +156,7 @@ ctc_tty_readmodem(ctc_tty_info *info)
                                         skb_queue_head(&info->rx_queue, skb);
                                 else {
                                         kfree_skb(skb);
-                                        ret = skb_queue_len(&info->rx_queue);
+                                        ret = !skb_queue_empty(&info->rx_queue);
                                 }
                         }
                 }
@@ -530,7 +530,7 @@ ctc_tty_write(struct tty_struct *tty, const u_char * buf, int count)
                 total += c;
                 count -= c;
         }
-        if (skb_queue_len(&info->tx_queue)) {
+        if (!skb_queue_empty(&info->tx_queue)) {
                 info->lsr &= ~UART_LSR_TEMT;
                 tasklet_schedule(&info->tasklet);
         }
@@ -594,7 +594,7 @@ ctc_tty_flush_chars(struct tty_struct *tty)
                 return;
         if (ctc_tty_paranoia_check(info, tty->name, "ctc_tty_flush_chars"))
                 return;
-        if (tty->stopped || tty->hw_stopped || (!skb_queue_len(&info->tx_queue)))
+        if (tty->stopped || tty->hw_stopped || skb_queue_empty(&info->tx_queue))
                 return;
         tasklet_schedule(&info->tasklet);
 }
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 8a945f4f3693..576f3b852fce 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -3227,9 +3227,9 @@ static int usbnet_stop (struct net_device *net)
         temp = unlink_urbs (dev, &dev->txq) + unlink_urbs (dev, &dev->rxq);
 
         // maybe wait for deletions to finish.
-        while (skb_queue_len (&dev->rxq)
-                        && skb_queue_len (&dev->txq)
-                        && skb_queue_len (&dev->done)) {
+        while (!skb_queue_empty(&dev->rxq) &&
+               !skb_queue_empty(&dev->txq) &&
+               !skb_queue_empty(&dev->done)) {
                 msleep(UNLINK_TIMEOUT_MS);
                 if (netif_msg_ifdown (dev))
                         devdbg (dev, "waited for %d urb completions", temp);