Return-Path: From: Suraj Sumangala To: CC: , Suraj Sumangala Subject: [PATCH v7 3/4] Modified hci_recv_fragment() to use hci_reassembly Date: Wed, 14 Jul 2010 13:02:18 +0530 Message-ID: <1279092739-4623-3-git-send-email-suraj@atheros.com> In-Reply-To: <1279092739-4623-2-git-send-email-suraj@atheros.com> References: <1279092739-4623-1-git-send-email-suraj@atheros.com> <1279092739-4623-2-git-send-email-suraj@atheros.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: modified packet based reassembly function hci_recv_fragment() to use hci_reassembly() Signed-off-by: Suraj Sumangala --- net/bluetooth/hci_core.c | 85 ++++++---------------------------------------- 1 files changed, 11 insertions(+), 74 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 477c4a6..451e266 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1142,87 +1142,24 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data, return remain; } -/* Receive packet type fragment */ -#define __reassembly(hdev, type) ((hdev)->reassembly[(type) - 1]) - int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) { + int rem = 0; + if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT) return -EILSEQ; - while (count) { - struct sk_buff *skb = __reassembly(hdev, type); - struct { int expect; } *scb; - int len = 0; - - if (!skb) { - /* Start of the frame */ - - switch (type) { - case HCI_EVENT_PKT: - if (count >= HCI_EVENT_HDR_SIZE) { - struct hci_event_hdr *h = data; - len = HCI_EVENT_HDR_SIZE + h->plen; - } else - return -EILSEQ; - break; - - case HCI_ACLDATA_PKT: - if (count >= HCI_ACL_HDR_SIZE) { - struct hci_acl_hdr *h = data; - len = HCI_ACL_HDR_SIZE + __le16_to_cpu(h->dlen); - } else - return -EILSEQ; - break; - - case HCI_SCODATA_PKT: - if (count >= HCI_SCO_HDR_SIZE) { - struct hci_sco_hdr *h = data; - len = HCI_SCO_HDR_SIZE + h->dlen; - } else - return -EILSEQ; - break; - } - - skb = bt_skb_alloc(len, GFP_ATOMIC); - if (!skb) { - BT_ERR("%s no memory for packet", hdev->name); - return -ENOMEM; - } - - skb->dev = (void *) hdev; - bt_cb(skb)->pkt_type = type; - - __reassembly(hdev, type) = skb; - - scb = (void *) skb->cb; - scb->expect = len; - } else { - /* Continuation */ - - scb = (void *) skb->cb; - len = scb->expect; - } - - len = min(len, count); - - memcpy(skb_put(skb, len), data, len); - - scb->expect -= len; - - if (scb->expect == 0) { - /* Complete frame */ + do { + rem = hci_reassembly(hdev, type, data, count, + type - 1, GFP_ATOMIC); + if (rem < 0) + return rem; - __reassembly(hdev, type) = NULL; + data += (count - rem); + count = rem; + } while (count); - bt_cb(skb)->pkt_type = type; - hci_recv_frame(skb); - } - - count -= len; data += len; - } - - return 0; + return rem; } EXPORT_SYMBOL(hci_recv_fragment); -- 1.7.0.4