summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorVishal Agarwal <vishal.agarwal@stericsson.com>2012-04-16 14:44:44 +0530
committerJohan Hedberg <johan.hedberg@intel.com>2012-04-16 12:57:45 +0300
commit6ec5bcadc21e13ceba8c144e4731eccac01d04f7 (patch)
treef0851fd42f167cf85539d1bd9109b17e0e0bf59e /net/bluetooth/hci_event.c
parent745c0ce35f904aeff8e1ea325c259a14a00ff1b7 (diff)
downloadblackbird-obmc-linux-6ec5bcadc21e13ceba8c144e4731eccac01d04f7.tar.gz
blackbird-obmc-linux-6ec5bcadc21e13ceba8c144e4731eccac01d04f7.zip
Bluetooth: Temporary keys should be retained during connection
If a key is non persistent then it should not be used in future connections but it should be kept for current connection. And it should be removed when connecion is removed. Signed-off-by: Vishal Agarwal <vishal.agarwal@stericsson.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index badb7851d116..6a72eaea70ee 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1902,6 +1902,8 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
}
if (ev->status == 0) {
+ if (conn->type == ACL_LINK && conn->flush_key)
+ hci_remove_link_key(hdev, &conn->dst);
hci_proto_disconn_cfm(conn, ev->reason);
hci_conn_del(conn);
}
OpenPOWER on IntegriCloud