diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-31 00:30:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-31 00:30:39 -0400 |
commit | b9caaabb995c6ff103e2457b9a36930b9699de7c (patch) | |
tree | 5e2fd04c5eb07ae1373c5c64250056e902982fa8 /drivers/bluetooth/hci_bcsp.c | |
parent | fc57e515a2c02599b00d252545521288dfc0158a (diff) | |
parent | 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'drivers/bluetooth/hci_bcsp.c')
-rw-r--r-- | drivers/bluetooth/hci_bcsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 894b2cb11ea6..40aec0fb8596 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c | |||
@@ -373,8 +373,9 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp) | |||
373 | 373 | ||
374 | i = 0; | 374 | i = 0; |
375 | skb_queue_walk_safe(&bcsp->unack, skb, tmp) { | 375 | skb_queue_walk_safe(&bcsp->unack, skb, tmp) { |
376 | if (i++ >= pkts_to_be_removed) | 376 | if (i >= pkts_to_be_removed) |
377 | break; | 377 | break; |
378 | i++; | ||
378 | 379 | ||
379 | __skb_unlink(skb, &bcsp->unack); | 380 | __skb_unlink(skb, &bcsp->unack); |
380 | kfree_skb(skb); | 381 | kfree_skb(skb); |