Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

1 files changed, 2 insertions, 16 deletions

diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 2562ebc1b22c..7af2e74deda8 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -982,17 +982,12 @@ void irlap_resend_rejected_frames(struct irlap_cb *self, int command)
 {
         struct sk_buff *tx_skb;
         struct sk_buff *skb;
-        int count;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LAP_MAGIC, return;);
 
-        /* Initialize variables */
-        count = skb_queue_len(&self->wx_list);
-
         /*  Resend unacknowledged frame(s) */
-        skb = skb_peek(&self->wx_list);
-        while (skb != NULL) {
+        skb_queue_walk(&self->wx_list, skb) {
                 irlap_wait_min_turn_around(self, &self->qos_tx);
 
                 /* We copy the skb to be retransmitted since we will have to
@@ -1011,21 +1006,12 @@ void irlap_resend_rejected_frames(struct irlap_cb *self, int command)
                 /*
                  *  Set poll bit on the last frame retransmitted
                  */
-                if (count-- == 1)
+                if (skb_queue_is_last(&self->wx_list, skb))
                         tx_skb->data[1] |= PF_BIT; /* Set p/f bit */
                 else
                         tx_skb->data[1] &= ~PF_BIT; /* Clear p/f bit */
 
                 irlap_send_i_frame(self, tx_skb, command);
-
-                /*
-                 *  If our skb is the last buffer in the list, then
-                 *  we are finished, if not, move to the next sk-buffer
-                 */
-                if (skb == skb_peek_tail(&self->wx_list))
-                        skb = NULL;
-                else
-                        skb = skb->next;
         }
 #if 0 /* Not yet */
         /*