Bluetooth: Improve USB driver throughput by increasing the frame size

[pandora-kernel.git] / drivers / bluetooth / hci_bcsp.c

diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 4d37bb3..894b2cb 100644 (file)
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -47,11 +47,6 @@
 
 #include "hci_uart.h"
 
-#ifndef CONFIG_BT_HCIUART_DEBUG
-#undef  BT_DBG
-#define BT_DBG( A... )
-#endif
-
 #define VERSION "0.3"
 
 static int txcrc = 1;
@@ -352,14 +347,14 @@ static int bcsp_flush(struct hci_uart *hu)
 /* Remove ack'ed packets */
 static void bcsp_pkt_cull(struct bcsp_struct *bcsp)
 {
+       struct sk_buff *skb, *tmp;
        unsigned long flags;
-       struct sk_buff *skb;
        int i, pkts_to_be_removed;
        u8 seqno;
 
        spin_lock_irqsave(&bcsp->unack.lock, flags);
 
-       pkts_to_be_removed = bcsp->unack.qlen;
+       pkts_to_be_removed = skb_queue_len(&bcsp->unack);
        seqno = bcsp->msgq_txseq;
 
        while (pkts_to_be_removed) {
@@ -373,19 +368,19 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp)
                BT_ERR("Peer acked invalid packet");
 
        BT_DBG("Removing %u pkts out of %u, up to seqno %u",
-               pkts_to_be_removed, bcsp->unack.qlen, (seqno - 1) & 0x07);
+              pkts_to_be_removed, skb_queue_len(&bcsp->unack),
+              (seqno - 1) & 0x07);
 
-       for (i = 0, skb = ((struct sk_buff *) &bcsp->unack)->next; i < pkts_to_be_removed
-                       && skb != (struct sk_buff *) &bcsp->unack; i++) {
-               struct sk_buff *nskb;
+       i = 0;
+       skb_queue_walk_safe(&bcsp->unack, skb, tmp) {
+               if (i++ >= pkts_to_be_removed)
+                       break;
 
-               nskb = skb->next;
                __skb_unlink(skb, &bcsp->unack);
                kfree_skb(skb);
-               skb = nskb;
        }
 
-       if (bcsp->unack.qlen == 0)
+       if (skb_queue_empty(&bcsp->unack))
                del_timer(&bcsp->tbcsp);
 
        spin_unlock_irqrestore(&bcsp->unack.lock, flags);