diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-04-28 14:29:02 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-28 15:14:42 -0400 |
commit | 4748fed2d1a2a7a816277754498b8aa70850e051 (patch) | |
tree | db0204847255d2326f084790f637ba298d8fe5bc /net/bluetooth/hci_core.c | |
parent | 655fe6ece7e71b37c17577ae485d11bf701c95f7 (diff) |
Bluetooth: Remove old_key_type from mgmt_ev_new_key
User space shouldn't have any need for the old key type so remove it
from the corresponding Management interface event.
Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 59ca4755b6b..60260cae3a0 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1097,14 +1097,15 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, | |||
1097 | 1097 | ||
1098 | bacpy(&key->bdaddr, bdaddr); | 1098 | bacpy(&key->bdaddr, bdaddr); |
1099 | memcpy(key->val, val, 16); | 1099 | memcpy(key->val, val, 16); |
1100 | key->type = type; | ||
1101 | key->pin_len = pin_len; | 1100 | key->pin_len = pin_len; |
1102 | 1101 | ||
1103 | if (new_key) | ||
1104 | mgmt_new_key(hdev->id, key, old_key_type); | ||
1105 | |||
1106 | if (type == HCI_LK_CHANGED_COMBINATION) | 1102 | if (type == HCI_LK_CHANGED_COMBINATION) |
1107 | key->type = old_key_type; | 1103 | key->type = old_key_type; |
1104 | else | ||
1105 | key->type = type; | ||
1106 | |||
1107 | if (new_key) | ||
1108 | mgmt_new_key(hdev->id, key); | ||
1108 | 1109 | ||
1109 | return 0; | 1110 | return 0; |
1110 | } | 1111 | } |