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/mgmt.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/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index e1384fc6016c..232ea8bfff19 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -1858,7 +1858,7 @@ int mgmt_connectable(u16 index, u8 connectable) | |||
1858 | return ret; | 1858 | return ret; |
1859 | } | 1859 | } |
1860 | 1860 | ||
1861 | int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type) | 1861 | int mgmt_new_key(u16 index, struct link_key *key) |
1862 | { | 1862 | { |
1863 | struct mgmt_ev_new_key ev; | 1863 | struct mgmt_ev_new_key ev; |
1864 | 1864 | ||
@@ -1868,7 +1868,6 @@ int mgmt_new_key(u16 index, struct link_key *key, u8 old_key_type) | |||
1868 | ev.key.type = key->type; | 1868 | ev.key.type = key->type; |
1869 | memcpy(ev.key.val, key->val, 16); | 1869 | memcpy(ev.key.val, key->val, 16); |
1870 | ev.key.pin_len = key->pin_len; | 1870 | ev.key.pin_len = key->pin_len; |
1871 | ev.old_key_type = old_key_type; | ||
1872 | 1871 | ||
1873 | return mgmt_event(MGMT_EV_NEW_KEY, index, &ev, sizeof(ev), NULL); | 1872 | return mgmt_event(MGMT_EV_NEW_KEY, index, &ev, sizeof(ev), NULL); |
1874 | } | 1873 | } |