aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/mgmt.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2011-04-28 11:28:59 -0700
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-28 16:14:40 -0300
commitd25e28abe58d2bcedf6025a6ccc532c29a19046f (patch)
treed56b5d6b7443814f354db364db2f5717bde147e3 /net/bluetooth/mgmt.c
parent582fbe9ef9d6fc089ff20956595f046d4899e74e (diff)
downloadkernel_samsung_smdk4412-d25e28abe58d2bcedf6025a6ccc532c29a19046f.zip
kernel_samsung_smdk4412-d25e28abe58d2bcedf6025a6ccc532c29a19046f.tar.gz
kernel_samsung_smdk4412-d25e28abe58d2bcedf6025a6ccc532c29a19046f.tar.bz2
Bluetooth: Fix link key persistent storage criteria
Link keys should only be stored if very specific criteria of the authentication process are fulfilled. This patch essentially copies the criteria that user space has so far been using to the kernel side so that the management interface works properly. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index a1b0ec4..e1384fc 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -945,7 +945,7 @@ static int load_keys(struct sock *sk, u16 index, unsigned char *data, u16 len)
for (i = 0; i < key_count; i++) {
struct mgmt_key_info *key = &cp->keys[i];
- hci_add_link_key(hdev, 0, &key->bdaddr, key->val, key->type,
+ hci_add_link_key(hdev, NULL, 0, &key->bdaddr, key->val, key->type,
key->pin_len);
}