Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[mv-sheeva.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 477c4a60a0790ec9b7ad4c7d38e2b4291a9faf5d..c52f091ee6de2c4b1e81f68363086e2af4a51660 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -924,7 +924,7 @@ int hci_register_dev(struct hci_dev *hdev)
 
        hci_conn_hash_init(hdev);
 
-       INIT_LIST_HEAD(&hdev->blacklist.list);
+       INIT_LIST_HEAD(&hdev->blacklist);
 
        memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
 
@@ -1142,89 +1142,61 @@ 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;
+               rem = hci_reassembly(hdev, type, data, count,
+                                               type - 1, GFP_ATOMIC);
+               if (rem < 0)
+                       return rem;
 
-                       __reassembly(hdev, type) = skb;
+               data += (count - rem);
+               count = rem;
+       };
 
-                       scb = (void *) skb->cb;
-                       scb->expect = len;
-               } else {
-                       /* Continuation */
+       return rem;
+}
+EXPORT_SYMBOL(hci_recv_fragment);
 
-                       scb = (void *) skb->cb;
-                       len = scb->expect;
-               }
+#define STREAM_REASSEMBLY 0
 
-               len = min(len, count);
+int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
+{
+       int type;
+       int rem = 0;
 
-               memcpy(skb_put(skb, len), data, len);
+       while (count) {
+               struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY];
 
-               scb->expect -= len;
+               if (!skb) {
+                       struct { char type; } *pkt;
 
-               if (scb->expect == 0) {
-                       /* Complete frame */
+                       /* Start of the frame */
+                       pkt = data;
+                       type = pkt->type;
 
-                       __reassembly(hdev, type) = NULL;
+                       data++;
+                       count--;
+               } else
+                       type = bt_cb(skb)->pkt_type;
 
-                       bt_cb(skb)->pkt_type = type;
-                       hci_recv_frame(skb);
-               }
+               rem = hci_reassembly(hdev, type, data,
+                                       count, STREAM_REASSEMBLY, GFP_ATOMIC);
+               if (rem < 0)
+                       return rem;
 
-               count -= len; data += len;
-       }
+               data += (count - rem);
+               count = rem;
+       };
 
-       return 0;
+       return rem;
 }
-EXPORT_SYMBOL(hci_recv_fragment);
+EXPORT_SYMBOL(hci_recv_stream_fragment);
 
 /* ---- Interface to upper protocols ---- */