diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-23 15:31:51 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-23 15:39:17 -0500 |
commit | 08c79b6133b70a6e3d462d11a89c80259ac66ec7 (patch) | |
tree | b4ef15186aa7ed85f44d79310fa1d97d0e238cd3 /net/bluetooth/hci_event.c | |
parent | 9246a8693e74b3480913cf6e0c2d472267169990 (diff) |
Bluetooth: mgmt: Add flags parameter to device_connected
This patch updates the Device Connected events to match the latest API
by adding a flags parameter to them.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 3d1eef0df2a3..fb6543b60dec 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -1368,7 +1368,7 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, | |||
1368 | struct inquiry_entry *e; | 1368 | struct inquiry_entry *e; |
1369 | 1369 | ||
1370 | if (conn && !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | 1370 | if (conn && !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) |
1371 | mgmt_device_connected(hdev, bdaddr, ACL_LINK, 0x00, | 1371 | mgmt_device_connected(hdev, bdaddr, ACL_LINK, 0x00, 0, |
1372 | name, name_len, conn->dev_class); | 1372 | name, name_len, conn->dev_class); |
1373 | 1373 | ||
1374 | if (discov->state == DISCOVERY_STOPPED) | 1374 | if (discov->state == DISCOVERY_STOPPED) |
@@ -2104,7 +2104,7 @@ static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff | |||
2104 | hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); | 2104 | hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); |
2105 | } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | 2105 | } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) |
2106 | mgmt_device_connected(hdev, &conn->dst, conn->type, | 2106 | mgmt_device_connected(hdev, &conn->dst, conn->type, |
2107 | conn->dst_type, NULL, 0, | 2107 | conn->dst_type, 0, NULL, 0, |
2108 | conn->dev_class); | 2108 | conn->dev_class); |
2109 | 2109 | ||
2110 | if (!hci_outgoing_auth_needed(hdev, conn)) { | 2110 | if (!hci_outgoing_auth_needed(hdev, conn)) { |
@@ -2872,7 +2872,7 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b | |||
2872 | hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); | 2872 | hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp); |
2873 | } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | 2873 | } else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) |
2874 | mgmt_device_connected(hdev, &conn->dst, conn->type, | 2874 | mgmt_device_connected(hdev, &conn->dst, conn->type, |
2875 | conn->dst_type, NULL, 0, | 2875 | conn->dst_type, 0, NULL, 0, |
2876 | conn->dev_class); | 2876 | conn->dev_class); |
2877 | 2877 | ||
2878 | if (!hci_outgoing_auth_needed(hdev, conn)) { | 2878 | if (!hci_outgoing_auth_needed(hdev, conn)) { |
@@ -3282,7 +3282,7 @@ static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff | |||
3282 | 3282 | ||
3283 | if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | 3283 | if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) |
3284 | mgmt_device_connected(hdev, &ev->bdaddr, conn->type, | 3284 | mgmt_device_connected(hdev, &ev->bdaddr, conn->type, |
3285 | conn->dst_type, NULL, 0, 0); | 3285 | conn->dst_type, 0, NULL, 0, 0); |
3286 | 3286 | ||
3287 | conn->sec_level = BT_SECURITY_LOW; | 3287 | conn->sec_level = BT_SECURITY_LOW; |
3288 | conn->handle = __le16_to_cpu(ev->handle); | 3288 | conn->handle = __le16_to_cpu(ev->handle); |