diff options
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 623501ddd1b8..c43cee4fcffd 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -3119,7 +3119,7 @@ static void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3119 | hci_conn_drop(conn); | 3119 | hci_conn_drop(conn); |
3120 | } | 3120 | } |
3121 | 3121 | ||
3122 | if (!test_bit(HCI_PAIRABLE, &hdev->dev_flags) && | 3122 | if (!test_bit(HCI_BONDABLE, &hdev->dev_flags) && |
3123 | !test_bit(HCI_CONN_AUTH_INITIATOR, &conn->flags)) { | 3123 | !test_bit(HCI_CONN_AUTH_INITIATOR, &conn->flags)) { |
3124 | hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY, | 3124 | hci_send_cmd(hdev, HCI_OP_PIN_CODE_NEG_REPLY, |
3125 | sizeof(ev->bdaddr), &ev->bdaddr); | 3125 | sizeof(ev->bdaddr), &ev->bdaddr); |
@@ -3652,7 +3652,7 @@ static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3652 | /* Allow pairing if we're pairable, the initiators of the | 3652 | /* Allow pairing if we're pairable, the initiators of the |
3653 | * pairing or if the remote is not requesting bonding. | 3653 | * pairing or if the remote is not requesting bonding. |
3654 | */ | 3654 | */ |
3655 | if (test_bit(HCI_PAIRABLE, &hdev->dev_flags) || | 3655 | if (test_bit(HCI_BONDABLE, &hdev->dev_flags) || |
3656 | test_bit(HCI_CONN_AUTH_INITIATOR, &conn->flags) || | 3656 | test_bit(HCI_CONN_AUTH_INITIATOR, &conn->flags) || |
3657 | (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) { | 3657 | (conn->remote_auth & ~0x01) == HCI_AT_NO_BONDING) { |
3658 | struct hci_cp_io_capability_reply cp; | 3658 | struct hci_cp_io_capability_reply cp; |