aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2012-03-07 23:25:00 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2012-03-08 00:02:26 -0500
commit04124681f104c1980024ff249a34a77a249fd2bc (patch)
tree5caad821f1cdd55930b054cbdeab1c45421559b4 /net/bluetooth/hci_event.c
parentf64b993f44c3a5fe709b276ac5652d006afe9d33 (diff)
Bluetooth: fix conding style issues all over the tree
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c110
1 files changed, 53 insertions, 57 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6a817daf095b..badb7851d116 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -556,7 +556,7 @@ static void hci_setup(struct hci_dev *hdev)
556 if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) { 556 if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
557 u8 mode = 0x01; 557 u8 mode = 0x01;
558 hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, 558 hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE,
559 sizeof(mode), &mode); 559 sizeof(mode), &mode);
560 } else { 560 } else {
561 struct hci_cp_write_eir cp; 561 struct hci_cp_write_eir cp;
562 562
@@ -577,14 +577,14 @@ static void hci_setup(struct hci_dev *hdev)
577 struct hci_cp_read_local_ext_features cp; 577 struct hci_cp_read_local_ext_features cp;
578 578
579 cp.page = 0x01; 579 cp.page = 0x01;
580 hci_send_cmd(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, 580 hci_send_cmd(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, sizeof(cp),
581 sizeof(cp), &cp); 581 &cp);
582 } 582 }
583 583
584 if (test_bit(HCI_LINK_SECURITY, &hdev->dev_flags)) { 584 if (test_bit(HCI_LINK_SECURITY, &hdev->dev_flags)) {
585 u8 enable = 1; 585 u8 enable = 1;
586 hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE, 586 hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE, sizeof(enable),
587 sizeof(enable), &enable); 587 &enable);
588 } 588 }
589} 589}
590 590
@@ -628,8 +628,8 @@ static void hci_setup_link_policy(struct hci_dev *hdev)
628 link_policy |= HCI_LP_PARK; 628 link_policy |= HCI_LP_PARK;
629 629
630 link_policy = cpu_to_le16(link_policy); 630 link_policy = cpu_to_le16(link_policy);
631 hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, 631 hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, sizeof(link_policy),
632 sizeof(link_policy), &link_policy); 632 &link_policy);
633} 633}
634 634
635static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb) 635static void hci_cc_read_local_commands(struct hci_dev *hdev, struct sk_buff *skb)
@@ -717,8 +717,8 @@ static void hci_set_le_support(struct hci_dev *hdev)
717 } 717 }
718 718
719 if (cp.le != !!(hdev->host_features[0] & LMP_HOST_LE)) 719 if (cp.le != !!(hdev->host_features[0] & LMP_HOST_LE))
720 hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, 720 hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(cp),
721 sizeof(cp), &cp); 721 &cp);
722} 722}
723 723
724static void hci_cc_read_local_ext_features(struct hci_dev *hdev, 724static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
@@ -976,8 +976,8 @@ static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
976 hci_dev_lock(hdev); 976 hci_dev_lock(hdev);
977 977
978 if (test_bit(HCI_MGMT, &hdev->dev_flags)) 978 if (test_bit(HCI_MGMT, &hdev->dev_flags))
979 mgmt_user_confirm_reply_complete(hdev, &rp->bdaddr, ACL_LINK, 979 mgmt_user_confirm_reply_complete(hdev, &rp->bdaddr, ACL_LINK, 0,
980 0, rp->status); 980 rp->status);
981 981
982 hci_dev_unlock(hdev); 982 hci_dev_unlock(hdev);
983} 983}
@@ -993,8 +993,7 @@ static void hci_cc_user_confirm_neg_reply(struct hci_dev *hdev,
993 993
994 if (test_bit(HCI_MGMT, &hdev->dev_flags)) 994 if (test_bit(HCI_MGMT, &hdev->dev_flags))
995 mgmt_user_confirm_neg_reply_complete(hdev, &rp->bdaddr, 995 mgmt_user_confirm_neg_reply_complete(hdev, &rp->bdaddr,
996 ACL_LINK, 0, 996 ACL_LINK, 0, rp->status);
997 rp->status);
998 997
999 hci_dev_unlock(hdev); 998 hci_dev_unlock(hdev);
1000} 999}
@@ -1009,7 +1008,7 @@ static void hci_cc_user_passkey_reply(struct hci_dev *hdev, struct sk_buff *skb)
1009 1008
1010 if (test_bit(HCI_MGMT, &hdev->dev_flags)) 1009 if (test_bit(HCI_MGMT, &hdev->dev_flags))
1011 mgmt_user_passkey_reply_complete(hdev, &rp->bdaddr, ACL_LINK, 1010 mgmt_user_passkey_reply_complete(hdev, &rp->bdaddr, ACL_LINK,
1012 0, rp->status); 1011 0, rp->status);
1013 1012
1014 hci_dev_unlock(hdev); 1013 hci_dev_unlock(hdev);
1015} 1014}
@@ -1025,8 +1024,7 @@ static void hci_cc_user_passkey_neg_reply(struct hci_dev *hdev,
1025 1024
1026 if (test_bit(HCI_MGMT, &hdev->dev_flags)) 1025 if (test_bit(HCI_MGMT, &hdev->dev_flags))
1027 mgmt_user_passkey_neg_reply_complete(hdev, &rp->bdaddr, 1026 mgmt_user_passkey_neg_reply_complete(hdev, &rp->bdaddr,
1028 ACL_LINK, 0, 1027 ACL_LINK, 0, rp->status);
1029 rp->status);
1030 1028
1031 hci_dev_unlock(hdev); 1029 hci_dev_unlock(hdev);
1032} 1030}
@@ -1337,7 +1335,7 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
1337} 1335}
1338 1336
1339static inline int hci_resolve_name(struct hci_dev *hdev, 1337static inline int hci_resolve_name(struct hci_dev *hdev,
1340 struct inquiry_entry *e) 1338 struct inquiry_entry *e)
1341{ 1339{
1342 struct hci_cp_remote_name_req cp; 1340 struct hci_cp_remote_name_req cp;
1343 1341
@@ -1369,14 +1367,14 @@ static bool hci_resolve_next_name(struct hci_dev *hdev)
1369} 1367}
1370 1368
1371static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, 1369static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,
1372 bdaddr_t *bdaddr, u8 *name, u8 name_len) 1370 bdaddr_t *bdaddr, u8 *name, u8 name_len)
1373{ 1371{
1374 struct discovery_state *discov = &hdev->discovery; 1372 struct discovery_state *discov = &hdev->discovery;
1375 struct inquiry_entry *e; 1373 struct inquiry_entry *e;
1376 1374
1377 if (conn && !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) 1375 if (conn && !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
1378 mgmt_device_connected(hdev, bdaddr, ACL_LINK, 0x00, 0, 1376 mgmt_device_connected(hdev, bdaddr, ACL_LINK, 0x00, 0, name,
1379 name, name_len, conn->dev_class); 1377 name_len, conn->dev_class);
1380 1378
1381 if (discov->state == DISCOVERY_STOPPED) 1379 if (discov->state == DISCOVERY_STOPPED)
1382 return; 1380 return;
@@ -1393,7 +1391,7 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,
1393 list_del(&e->list); 1391 list_del(&e->list);
1394 if (name) 1392 if (name)
1395 mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, 1393 mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00,
1396 e->data.rssi, name, name_len); 1394 e->data.rssi, name, name_len);
1397 } 1395 }
1398 1396
1399 if (hci_resolve_next_name(hdev)) 1397 if (hci_resolve_next_name(hdev))
@@ -1602,7 +1600,7 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)
1602 conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle)); 1600 conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(cp->handle));
1603 if (conn) 1601 if (conn)
1604 mgmt_disconnect_failed(hdev, &conn->dst, conn->type, 1602 mgmt_disconnect_failed(hdev, &conn->dst, conn->type,
1605 conn->dst_type, status); 1603 conn->dst_type, status);
1606 1604
1607 hci_dev_unlock(hdev); 1605 hci_dev_unlock(hdev);
1608} 1606}
@@ -1718,8 +1716,8 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *
1718 1716
1719 name_known = hci_inquiry_cache_update(hdev, &data, false, &ssp); 1717 name_known = hci_inquiry_cache_update(hdev, &data, false, &ssp);
1720 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00, 1718 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
1721 info->dev_class, 0, !name_known, ssp, 1719 info->dev_class, 0, !name_known, ssp, NULL,
1722 NULL, 0); 1720 0);
1723 } 1721 }
1724 1722
1725 hci_dev_unlock(hdev); 1723 hci_dev_unlock(hdev);
@@ -1770,7 +1768,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
1770 struct hci_cp_read_remote_features cp; 1768 struct hci_cp_read_remote_features cp;
1771 cp.handle = ev->handle; 1769 cp.handle = ev->handle;
1772 hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES, 1770 hci_send_cmd(hdev, HCI_OP_READ_REMOTE_FEATURES,
1773 sizeof(cp), &cp); 1771 sizeof(cp), &cp);
1774 } 1772 }
1775 1773
1776 /* Set packet type for incoming connection */ 1774 /* Set packet type for incoming connection */
@@ -1778,14 +1776,14 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s
1778 struct hci_cp_change_conn_ptype cp; 1776 struct hci_cp_change_conn_ptype cp;
1779 cp.handle = ev->handle; 1777 cp.handle = ev->handle;
1780 cp.pkt_type = cpu_to_le16(conn->pkt_type); 1778 cp.pkt_type = cpu_to_le16(conn->pkt_type);
1781 hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE, 1779 hci_send_cmd(hdev, HCI_OP_CHANGE_CONN_PTYPE, sizeof(cp),
1782 sizeof(cp), &cp); 1780 &cp);
1783 } 1781 }
1784 } else { 1782 } else {
1785 conn->state = BT_CLOSED; 1783 conn->state = BT_CLOSED;
1786 if (conn->type == ACL_LINK) 1784 if (conn->type == ACL_LINK)
1787 mgmt_connect_failed(hdev, &ev->bdaddr, conn->type, 1785 mgmt_connect_failed(hdev, &ev->bdaddr, conn->type,
1788 conn->dst_type, ev->status); 1786 conn->dst_type, ev->status);
1789 } 1787 }
1790 1788
1791 if (conn->type == ACL_LINK) 1789 if (conn->type == ACL_LINK)
@@ -1850,8 +1848,8 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
1850 else 1848 else
1851 cp.role = 0x01; /* Remain slave */ 1849 cp.role = 0x01; /* Remain slave */
1852 1850
1853 hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, 1851 hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp),
1854 sizeof(cp), &cp); 1852 &cp);
1855 } else { 1853 } else {
1856 struct hci_cp_accept_sync_conn_req cp; 1854 struct hci_cp_accept_sync_conn_req cp;
1857 1855
@@ -1865,7 +1863,7 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
1865 cp.retrans_effort = 0xff; 1863 cp.retrans_effort = 0xff;
1866 1864
1867 hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ, 1865 hci_send_cmd(hdev, HCI_OP_ACCEPT_SYNC_CONN_REQ,
1868 sizeof(cp), &cp); 1866 sizeof(cp), &cp);
1869 } 1867 }
1870 } else { 1868 } else {
1871 /* Connection rejected */ 1869 /* Connection rejected */
@@ -1900,7 +1898,7 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
1900 conn->dst_type, ev->status); 1898 conn->dst_type, ev->status);
1901 else 1899 else
1902 mgmt_device_disconnected(hdev, &conn->dst, conn->type, 1900 mgmt_device_disconnected(hdev, &conn->dst, conn->type,
1903 conn->dst_type); 1901 conn->dst_type);
1904 } 1902 }
1905 1903
1906 if (ev->status == 0) { 1904 if (ev->status == 0) {
@@ -1935,7 +1933,7 @@ static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *s
1935 } 1933 }
1936 } else { 1934 } else {
1937 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type, 1935 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
1938 ev->status); 1936 ev->status);
1939 } 1937 }
1940 1938
1941 clear_bit(HCI_CONN_AUTH_PEND, &conn->flags); 1939 clear_bit(HCI_CONN_AUTH_PEND, &conn->flags);
@@ -1996,7 +1994,7 @@ static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb
1996 1994
1997 if (ev->status == 0) 1995 if (ev->status == 0)
1998 hci_check_pending_name(hdev, conn, &ev->bdaddr, ev->name, 1996 hci_check_pending_name(hdev, conn, &ev->bdaddr, ev->name,
1999 strnlen(ev->name, HCI_MAX_NAME_LENGTH)); 1997 strnlen(ev->name, HCI_MAX_NAME_LENGTH));
2000 else 1998 else
2001 hci_check_pending_name(hdev, conn, &ev->bdaddr, NULL, 0); 1999 hci_check_pending_name(hdev, conn, &ev->bdaddr, NULL, 0);
2002 2000
@@ -2111,8 +2109,8 @@ static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff
2111 hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); 2109 hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp);
2112 } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) 2110 } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
2113 mgmt_device_connected(hdev, &conn->dst, conn->type, 2111 mgmt_device_connected(hdev, &conn->dst, conn->type,
2114 conn->dst_type, 0, NULL, 0, 2112 conn->dst_type, 0, NULL, 0,
2115 conn->dev_class); 2113 conn->dev_class);
2116 2114
2117 if (!hci_outgoing_auth_needed(hdev, conn)) { 2115 if (!hci_outgoing_auth_needed(hdev, conn)) {
2118 conn->state = BT_CONNECTED; 2116 conn->state = BT_CONNECTED;
@@ -2524,7 +2522,7 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
2524} 2522}
2525 2523
2526static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev, 2524static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev,
2527 struct sk_buff *skb) 2525 struct sk_buff *skb)
2528{ 2526{
2529 struct hci_ev_num_comp_blocks *ev = (void *) skb->data; 2527 struct hci_ev_num_comp_blocks *ev = (void *) skb->data;
2530 int i; 2528 int i;
@@ -2816,10 +2814,10 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct
2816 data.ssp_mode = 0x00; 2814 data.ssp_mode = 0x00;
2817 2815
2818 name_known = hci_inquiry_cache_update(hdev, &data, 2816 name_known = hci_inquiry_cache_update(hdev, &data,
2819 false, &ssp); 2817 false, &ssp);
2820 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00, 2818 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
2821 info->dev_class, info->rssi, 2819 info->dev_class, info->rssi,
2822 !name_known, ssp, NULL, 0); 2820 !name_known, ssp, NULL, 0);
2823 } 2821 }
2824 } else { 2822 } else {
2825 struct inquiry_info_with_rssi *info = (void *) (skb->data + 1); 2823 struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);
@@ -2834,10 +2832,10 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct
2834 data.rssi = info->rssi; 2832 data.rssi = info->rssi;
2835 data.ssp_mode = 0x00; 2833 data.ssp_mode = 0x00;
2836 name_known = hci_inquiry_cache_update(hdev, &data, 2834 name_known = hci_inquiry_cache_update(hdev, &data,
2837 false, &ssp); 2835 false, &ssp);
2838 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00, 2836 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
2839 info->dev_class, info->rssi, 2837 info->dev_class, info->rssi,
2840 !name_known, ssp, NULL, 0); 2838 !name_known, ssp, NULL, 0);
2841 } 2839 }
2842 } 2840 }
2843 2841
@@ -2879,8 +2877,8 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b
2879 hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); 2877 hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp);
2880 } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) 2878 } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
2881 mgmt_device_connected(hdev, &conn->dst, conn->type, 2879 mgmt_device_connected(hdev, &conn->dst, conn->type,
2882 conn->dst_type, 0, NULL, 0, 2880 conn->dst_type, 0, NULL, 0,
2883 conn->dev_class); 2881 conn->dev_class);
2884 2882
2885 if (!hci_outgoing_auth_needed(hdev, conn)) { 2883 if (!hci_outgoing_auth_needed(hdev, conn)) {
2886 conn->state = BT_CONNECTED; 2884 conn->state = BT_CONNECTED;
@@ -2986,17 +2984,16 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
2986 2984
2987 if (test_bit(HCI_MGMT, &hdev->dev_flags)) 2985 if (test_bit(HCI_MGMT, &hdev->dev_flags))
2988 name_known = eir_has_data_type(info->data, 2986 name_known = eir_has_data_type(info->data,
2989 sizeof(info->data), 2987 sizeof(info->data),
2990 EIR_NAME_COMPLETE); 2988 EIR_NAME_COMPLETE);
2991 else 2989 else
2992 name_known = true; 2990 name_known = true;
2993 2991
2994 name_known = hci_inquiry_cache_update(hdev, &data, name_known, 2992 name_known = hci_inquiry_cache_update(hdev, &data, name_known,
2995 &ssp); 2993 &ssp);
2996 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00, 2994 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
2997 info->dev_class, info->rssi, 2995 info->dev_class, info->rssi, !name_known,
2998 !name_known, ssp, info->data, 2996 ssp, info->data, sizeof(info->data));
2999 sizeof(info->data));
3000 } 2997 }
3001 2998
3002 hci_dev_unlock(hdev); 2999 hci_dev_unlock(hdev);
@@ -3157,7 +3154,7 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev,
3157 3154
3158confirm: 3155confirm:
3159 mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0, ev->passkey, 3156 mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0, ev->passkey,
3160 confirm_hint); 3157 confirm_hint);
3161 3158
3162unlock: 3159unlock:
3163 hci_dev_unlock(hdev); 3160 hci_dev_unlock(hdev);
@@ -3198,7 +3195,7 @@ static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_
3198 * the mgmt_auth_failed event */ 3195 * the mgmt_auth_failed event */
3199 if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0) 3196 if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0)
3200 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type, 3197 mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
3201 ev->status); 3198 ev->status);
3202 3199
3203 hci_conn_put(conn); 3200 hci_conn_put(conn);
3204 3201
@@ -3223,7 +3220,7 @@ static inline void hci_remote_host_features_evt(struct hci_dev *hdev, struct sk_
3223} 3220}
3224 3221
3225static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev, 3222static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
3226 struct sk_buff *skb) 3223 struct sk_buff *skb)
3227{ 3224{
3228 struct hci_ev_remote_oob_data_request *ev = (void *) skb->data; 3225 struct hci_ev_remote_oob_data_request *ev = (void *) skb->data;
3229 struct oob_data *data; 3226 struct oob_data *data;
@@ -3289,7 +3286,7 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff
3289 3286
3290 if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) 3287 if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
3291 mgmt_device_connected(hdev, &ev->bdaddr, conn->type, 3288 mgmt_device_connected(hdev, &ev->bdaddr, conn->type,
3292 conn->dst_type, 0, NULL, 0, NULL); 3289 conn->dst_type, 0, NULL, 0, NULL);
3293 3290
3294 conn->sec_level = BT_SECURITY_LOW; 3291 conn->sec_level = BT_SECURITY_LOW;
3295 conn->handle = __le16_to_cpu(ev->handle); 3292 conn->handle = __le16_to_cpu(ev->handle);
@@ -3320,8 +3317,7 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev,
3320 3317
3321 rssi = ev->data[ev->length]; 3318 rssi = ev->data[ev->length];
3322 mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type, 3319 mgmt_device_found(hdev, &ev->bdaddr, LE_LINK, ev->bdaddr_type,
3323 NULL, rssi, 0, 1, ev->data, 3320 NULL, rssi, 0, 1, ev->data, ev->length);
3324 ev->length);
3325 3321
3326 ptr += sizeof(*ev) + ev->length + 1; 3322 ptr += sizeof(*ev) + ev->length + 1;
3327 } 3323 }
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-23 02:22:12 -0500