aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-07-14 14:13:48 -0400
committerMarcel Holtmann <marcel@holtmann.org>2008-07-14 14:13:48 -0400
commit0493684ed2397e111574f343534d8e4ec440dfa5 (patch)
treeea27e8d7ecbc197893c16b36af0ac4419264d62d /net
parentc7bdd5026d28d178238bd794c61612602a54d55e (diff)
[Bluetooth] Disable disconnect timer during Simple Pairing
During the Simple Pairing process the HCI disconnect timer must be disabled. The way to do this is by holding a reference count of the HCI connection. The Simple Pairing process on both sides starts with an IO Capabilities Request and ends with Simple Pairing Complete. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e47676128bb5..7c9ac01cd8f9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1464,6 +1464,38 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
1464 hci_dev_unlock(hdev); 1464 hci_dev_unlock(hdev);
1465} 1465}
1466 1466
1467static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
1468{
1469 struct hci_ev_io_capa_request *ev = (void *) skb->data;
1470 struct hci_conn *conn;
1471
1472 BT_DBG("%s", hdev->name);
1473
1474 hci_dev_lock(hdev);
1475
1476 conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
1477 if (conn)
1478 hci_conn_hold(conn);
1479
1480 hci_dev_unlock(hdev);
1481}
1482
1483static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1484{
1485 struct hci_ev_simple_pair_complete *ev = (void *) skb->data;
1486 struct hci_conn *conn;
1487
1488 BT_DBG("%s", hdev->name);
1489
1490 hci_dev_lock(hdev);
1491
1492 conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
1493 if (conn)
1494 hci_conn_put(conn);
1495
1496 hci_dev_unlock(hdev);
1497}
1498
1467void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) 1499void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
1468{ 1500{
1469 struct hci_event_hdr *hdr = (void *) skb->data; 1501 struct hci_event_hdr *hdr = (void *) skb->data;
@@ -1588,6 +1620,14 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
1588 hci_extended_inquiry_result_evt(hdev, skb); 1620 hci_extended_inquiry_result_evt(hdev, skb);
1589 break; 1621 break;
1590 1622
1623 case HCI_EV_IO_CAPA_REQUEST:
1624 hci_io_capa_request_evt(hdev, skb);
1625 break;
1626
1627 case HCI_EV_SIMPLE_PAIR_COMPLETE:
1628 hci_simple_pair_complete_evt(hdev, skb);
1629 break;
1630
1591 default: 1631 default:
1592 BT_DBG("%s event 0x%x", hdev->name, event); 1632 BT_DBG("%s event 0x%x", hdev->name, event);
1593 break; 1633 break;