diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hci_conn.c | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_event.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index de0b93e45980..b328ac611ccd 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -123,7 +123,7 @@ static void hci_acl_connect_cancel(struct hci_conn *conn) | |||
123 | 123 | ||
124 | BT_DBG("%p", conn); | 124 | BT_DBG("%p", conn); |
125 | 125 | ||
126 | if (conn->hdev->hci_ver < 2) | 126 | if (conn->hdev->hci_ver < BLUETOOTH_VER_1_2) |
127 | return; | 127 | return; |
128 | 128 | ||
129 | bacpy(&cp.bdaddr, &conn->dst); | 129 | bacpy(&cp.bdaddr, &conn->dst); |
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index e3f7a8192446..a3e83aa92ecd 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -500,7 +500,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev) | |||
500 | 500 | ||
501 | /* CSR 1.1 dongles does not accept any bitfield so don't try to set | 501 | /* CSR 1.1 dongles does not accept any bitfield so don't try to set |
502 | * any event mask for pre 1.2 devices */ | 502 | * any event mask for pre 1.2 devices */ |
503 | if (hdev->lmp_ver <= 1) | 503 | if (hdev->lmp_ver <= BLUETOOTH_VER_1_1) |
504 | return; | 504 | return; |
505 | 505 | ||
506 | events[4] |= 0x01; /* Flow Specification Complete */ | 506 | events[4] |= 0x01; /* Flow Specification Complete */ |
@@ -564,7 +564,7 @@ static void hci_setup(struct hci_dev *hdev) | |||
564 | { | 564 | { |
565 | hci_setup_event_mask(hdev); | 565 | hci_setup_event_mask(hdev); |
566 | 566 | ||
567 | if (hdev->hci_ver > 1) | 567 | if (hdev->hci_ver > BLUETOOTH_VER_1_1) |
568 | hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL); | 568 | hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL); |
569 | 569 | ||
570 | if (hdev->features[6] & LMP_SIMPLE_PAIR) { | 570 | if (hdev->features[6] & LMP_SIMPLE_PAIR) { |
@@ -1558,7 +1558,7 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s | |||
1558 | } | 1558 | } |
1559 | 1559 | ||
1560 | /* Set packet type for incoming connection */ | 1560 | /* Set packet type for incoming connection */ |
1561 | if (!conn->out && hdev->hci_ver < 3) { | 1561 | if (!conn->out && hdev->hci_ver < BLUETOOTH_VER_2_0) { |
1562 | struct hci_cp_change_conn_ptype cp; | 1562 | struct hci_cp_change_conn_ptype cp; |
1563 | cp.handle = ev->handle; | 1563 | cp.handle = ev->handle; |
1564 | cp.pkt_type = cpu_to_le16(conn->pkt_type); | 1564 | cp.pkt_type = cpu_to_le16(conn->pkt_type); |