diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-04-28 11:28:59 -0700 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-28 16:14:40 -0300 |
| commit | d25e28abe58d2bcedf6025a6ccc532c29a19046f (patch) | |
| tree | d56b5d6b7443814f354db364db2f5717bde147e3 /include/net/bluetooth/hci_core.h | |
| parent | 582fbe9ef9d6fc089ff20956595f046d4899e74e (diff) | |
| download | linux-stable-d25e28abe58d2bcedf6025a6ccc532c29a19046f.tar.gz linux-stable-d25e28abe58d2bcedf6025a6ccc532c29a19046f.tar.bz2 linux-stable-d25e28abe58d2bcedf6025a6ccc532c29a19046f.zip | |
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 'include/net/bluetooth/hci_core.h')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 135dfac1be12..3a3f7b453803 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -515,8 +515,8 @@ int hci_uuids_clear(struct hci_dev *hdev); int hci_link_keys_clear(struct hci_dev *hdev); struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); -int hci_add_link_key(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr, - u8 *key, u8 type, u8 pin_len); +int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, + bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len); int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr); int hci_remote_oob_data_clear(struct hci_dev *hdev); |