From fdf294c1b72c0f41a38b0f20105366276f3361cb Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Sat, 24 Jul 2010 01:34:54 -0300 Subject: [PATCH] --- yaml --- r: 203919 b: refs/heads/master c: da5f6c37eee040775997191d1a1bc91c0c1e51eb h: refs/heads/master i: 203917: 3735ceb97198814904a6e2040ed06dc350403670 203915: af46eb41577fca69e34af07bbf7195bf7bbf38af 203911: cfbe85cab16d653ee8ceed56490cf85ca46c9855 203903: 922ad8bf5638d6a95853edb1079a2bd241e7ac5d v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_core.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 16c71d7478c0..30402264a0eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bbdf6cba0fb730ae2f2cfd5ead3d1e2e5498ddc +refs/heads/master: da5f6c37eee040775997191d1a1bc91c0c1e51eb diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c index 995c9f9b84d0..8303f1c9ef54 100644 --- a/trunk/net/bluetooth/hci_core.c +++ b/trunk/net/bluetooth/hci_core.c @@ -1149,7 +1149,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT) return -EILSEQ; - do { + while (count) { rem = hci_reassembly(hdev, type, data, count, type - 1, GFP_ATOMIC); if (rem < 0) @@ -1157,7 +1157,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) data += (count - rem); count = rem; - } while (count); + }; return rem; } @@ -1170,7 +1170,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count) int type; int rem = 0; - do { + while (count) { struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY]; if (!skb) { @@ -1192,7 +1192,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count) data += (count - rem); count = rem; - } while (count); + }; return rem; }