summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorVinicius Costa Gomes <vinicius.gomes@openbossa.org>2011-06-09 18:50:53 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-06-13 16:05:37 -0300
commitda85e5e5afeb72bb6e6b5192a2d252861fafc3e7 (patch)
tree36fb5b1db3da5984f6ae45ce0b406f41b1a85ed2 /net/bluetooth/hci_event.c
parentb8e66eacab21870d4f800822111c494f9ef291e3 (diff)
downloadblackbird-op-linux-da85e5e5afeb72bb6e6b5192a2d252861fafc3e7.tar.gz
blackbird-op-linux-da85e5e5afeb72bb6e6b5192a2d252861fafc3e7.zip
Bluetooth: Add support for Pairing features exchange
This patch implements a simple version of the SMP Pairing Features exchange procedure (Vol. 3 Part H, Section 2.3.5.1). For now, everything that would cause a Pairing Method different of Just Works to be chosen is rejected. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 21d6055589ee..ac2c5e89617c 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1622,6 +1622,7 @@ static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *
/* Encryption implies authentication */
conn->link_mode |= HCI_LM_AUTH;
conn->link_mode |= HCI_LM_ENCRYPT;
+ conn->sec_level = conn->pending_sec_level;
} else
conn->link_mode &= ~HCI_LM_ENCRYPT;
}
OpenPOWER on IntegriCloud