aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index bb94e6da223c..00d845e3d307 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1,4 +1,4 @@
1/* 1/*
2 BlueZ - Bluetooth protocol stack for Linux 2 BlueZ - Bluetooth protocol stack for Linux
3 Copyright (C) 2000-2001 Qualcomm Incorporated 3 Copyright (C) 2000-2001 Qualcomm Incorporated
4 4
@@ -12,13 +12,13 @@
12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
14 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 14 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
15 CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
16 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
17 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 19
20 ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
21 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 21 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
22 SOFTWARE IS DISCLAIMED. 22 SOFTWARE IS DISCLAIMED.
23*/ 23*/
24 24
@@ -100,7 +100,7 @@ static void hci_cc_link_policy(struct hci_dev *hdev, __u16 ocf, struct sk_buff *
100 BT_DBG("%s ocf 0x%x", hdev->name, ocf); 100 BT_DBG("%s ocf 0x%x", hdev->name, ocf);
101 101
102 switch (ocf) { 102 switch (ocf) {
103 case OCF_ROLE_DISCOVERY: 103 case OCF_ROLE_DISCOVERY:
104 rd = (void *) skb->data; 104 rd = (void *) skb->data;
105 105
106 if (rd->status) 106 if (rd->status)
@@ -141,7 +141,7 @@ static void hci_cc_link_policy(struct hci_dev *hdev, __u16 ocf, struct sk_buff *
141 break; 141 break;
142 142
143 default: 143 default:
144 BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x", 144 BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x",
145 hdev->name, ocf); 145 hdev->name, ocf);
146 break; 146 break;
147 } 147 }
@@ -237,10 +237,10 @@ static void hci_cc_host_ctl(struct hci_dev *hdev, __u16 ocf, struct sk_buff *skb
237 if (!status) { 237 if (!status) {
238 clear_bit(HCI_PSCAN, &hdev->flags); 238 clear_bit(HCI_PSCAN, &hdev->flags);
239 clear_bit(HCI_ISCAN, &hdev->flags); 239 clear_bit(HCI_ISCAN, &hdev->flags);
240 if (param & SCAN_INQUIRY) 240 if (param & SCAN_INQUIRY)
241 set_bit(HCI_ISCAN, &hdev->flags); 241 set_bit(HCI_ISCAN, &hdev->flags);
242 242
243 if (param & SCAN_PAGE) 243 if (param & SCAN_PAGE)
244 set_bit(HCI_PSCAN, &hdev->flags); 244 set_bit(HCI_PSCAN, &hdev->flags);
245 } 245 }
246 hci_req_complete(hdev, status); 246 hci_req_complete(hdev, status);
@@ -343,7 +343,7 @@ static void hci_cc_info_param(struct hci_dev *hdev, __u16 ocf, struct sk_buff *s
343 343
344 memcpy(hdev->features, lf->features, sizeof(hdev->features)); 344 memcpy(hdev->features, lf->features, sizeof(hdev->features));
345 345
346 /* Adjust default settings according to features 346 /* Adjust default settings according to features
347 * supported by device. */ 347 * supported by device. */
348 if (hdev->features[0] & LMP_3SLOT) 348 if (hdev->features[0] & LMP_3SLOT)
349 hdev->pkt_type |= (HCI_DM3 | HCI_DH3); 349 hdev->pkt_type |= (HCI_DM3 | HCI_DH3);
@@ -491,7 +491,7 @@ static void hci_cs_link_ctl(struct hci_dev *hdev, __u16 ocf, __u8 status)
491 break; 491 break;
492 492
493 default: 493 default:
494 BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d", 494 BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d",
495 hdev->name, ocf, status); 495 hdev->name, ocf, status);
496 break; 496 break;
497 } 497 }
@@ -793,7 +793,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
793 if (!conn->out) { 793 if (!conn->out) {
794 struct hci_cp_change_conn_ptype cp; 794 struct hci_cp_change_conn_ptype cp;
795 cp.handle = ev->handle; 795 cp.handle = ev->handle;
796 cp.pkt_type = (conn->type == ACL_LINK) ? 796 cp.pkt_type = (conn->type == ACL_LINK) ?
797 __cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK): 797 __cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK):
798 __cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK); 798 __cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
799 799