[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>

6 files changed, 13 insertions, 14 deletions

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 {