diff options
author | Suraj Sumangala <suraj@atheros.com> | 2010-07-14 03:32:16 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-21 13:39:12 -0400 |
commit | cd4c53919ed50b0d532f106aeb76e79077bece98 (patch) | |
tree | db669259c941d543a12014fc0d69103a4e368cea /net/bluetooth | |
parent | 0a79f67445de50ca0a8dc1d34f3cc406d89c28b2 (diff) |
Bluetooth: Add one more buffer for HCI stream reassembly
Additional reassembly buffer to keep track of stream reasembly
Signed-off-by: Suraj Sumangala <suraj@atheros.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index aeb2982310a0..0ded790bfb67 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -914,7 +914,7 @@ int hci_register_dev(struct hci_dev *hdev) | |||
914 | skb_queue_head_init(&hdev->cmd_q); | 914 | skb_queue_head_init(&hdev->cmd_q); |
915 | skb_queue_head_init(&hdev->raw_q); | 915 | skb_queue_head_init(&hdev->raw_q); |
916 | 916 | ||
917 | for (i = 0; i < 3; i++) | 917 | for (i = 0; i < NUM_REASSEMBLY; i++) |
918 | hdev->reassembly[i] = NULL; | 918 | hdev->reassembly[i] = NULL; |
919 | 919 | ||
920 | init_waitqueue_head(&hdev->req_wait_q); | 920 | init_waitqueue_head(&hdev->req_wait_q); |
@@ -973,7 +973,7 @@ int hci_unregister_dev(struct hci_dev *hdev) | |||
973 | 973 | ||
974 | hci_dev_do_close(hdev); | 974 | hci_dev_do_close(hdev); |
975 | 975 | ||
976 | for (i = 0; i < 3; i++) | 976 | for (i = 0; i < NUM_REASSEMBLY; i++) |
977 | kfree_skb(hdev->reassembly[i]); | 977 | kfree_skb(hdev->reassembly[i]); |
978 | 978 | ||
979 | hci_notify(hdev, HCI_DEV_UNREG); | 979 | hci_notify(hdev, HCI_DEV_UNREG); |
@@ -1034,7 +1034,7 @@ int hci_recv_frame(struct sk_buff *skb) | |||
1034 | EXPORT_SYMBOL(hci_recv_frame); | 1034 | EXPORT_SYMBOL(hci_recv_frame); |
1035 | 1035 | ||
1036 | /* Receive packet type fragment */ | 1036 | /* Receive packet type fragment */ |
1037 | #define __reassembly(hdev, type) ((hdev)->reassembly[(type) - 2]) | 1037 | #define __reassembly(hdev, type) ((hdev)->reassembly[(type) - 1]) |
1038 | 1038 | ||
1039 | int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) | 1039 | int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) |
1040 | { | 1040 | { |