diff options
| author | Vishal Agarwal | 2012-04-16 11:14:44 +0200 |
|---|---|---|
| committer | Johan Hedberg | 2012-04-16 11:57:45 +0200 |
| commit | 6ec5bcadc21e13ceba8c144e4731eccac01d04f7 (patch) | |
| tree | f0851fd42f167cf85539d1bd9109b17e0e0bf59e /net/bluetooth/hci_core.c | |
| parent | Bluetooth: hci_persistent_key should return bool (diff) | |
| download | kernel-qcow2-linux-6ec5bcadc21e13ceba8c144e4731eccac01d04f7.tar.gz kernel-qcow2-linux-6ec5bcadc21e13ceba8c144e4731eccac01d04f7.tar.xz kernel-qcow2-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_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index c2251e4c3b72..a7607e4be347 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1330,10 +1330,8 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, mgmt_new_link_key(hdev, key, persistent); - if (!persistent) { - list_del(&key->list); - kfree(key); - } + if (conn) + conn->flush_key = !persistent; return 0; } |