diff options
| author | Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com> | 2011-04-28 12:07:55 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-28 15:02:12 -0300 |
| commit | 13d39315c22b128f4796fc008b04914a7c32bb1a (patch) | |
| tree | 81f6ed817d6814ba2af5c0bf8a6b7ede9999a395 /net/bluetooth/hci_event.c | |
| parent | 9003c4e220c2954a53c5da0d739ed15a46c13429 (diff) | |
| download | kernel_samsung_smdk4412-13d39315c22b128f4796fc008b04914a7c32bb1a.zip kernel_samsung_smdk4412-13d39315c22b128f4796fc008b04914a7c32bb1a.tar.gz kernel_samsung_smdk4412-13d39315c22b128f4796fc008b04914a7c32bb1a.tar.bz2 | |
Bluetooth: Map sec_level to link key requirements
Keep the link key type together with connection and use it to
map security level to link key requirements. Authenticate and/or
encrypt connection if the link is insufficiently secure.
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 35f9898..655af8b 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2095,6 +2095,10 @@ static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff hci_conn_hold(conn); conn->disc_timeout = HCI_DISCONN_TIMEOUT; pin_len = conn->pin_length; + + if (ev->key_type != HCI_LK_CHANGED_COMBINATION) + conn->key_type = ev->key_type; + hci_conn_put(conn); } |