diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2013-01-09 08:29:34 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-01-10 03:08:35 -0500 |
commit | 715a5bf2db4df4a7df64f420d21fb49ba146b3fa (patch) | |
tree | fb1e9524e6781ebda12f4d9500f0ef554d207ea7 /net | |
parent | e384662b1c1004e6b1e9d2c4979945a383c07b7d (diff) |
Bluetooth: Fix missing command complete for mgmt_load_long_term_keys
All management events are expected to indicate successful completion
through a command complete event, however the load long term keys
command was missing this. This patch adds the missing event.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/mgmt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 577f316d87ad..1dd41d48eb66 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -2648,7 +2648,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, | |||
2648 | { | 2648 | { |
2649 | struct mgmt_cp_load_long_term_keys *cp = cp_data; | 2649 | struct mgmt_cp_load_long_term_keys *cp = cp_data; |
2650 | u16 key_count, expected_len; | 2650 | u16 key_count, expected_len; |
2651 | int i; | 2651 | int i, err; |
2652 | 2652 | ||
2653 | key_count = __le16_to_cpu(cp->key_count); | 2653 | key_count = __le16_to_cpu(cp->key_count); |
2654 | 2654 | ||
@@ -2682,9 +2682,12 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, | |||
2682 | key->enc_size, key->ediv, key->rand); | 2682 | key->enc_size, key->ediv, key->rand); |
2683 | } | 2683 | } |
2684 | 2684 | ||
2685 | err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0, | ||
2686 | NULL, 0); | ||
2687 | |||
2685 | hci_dev_unlock(hdev); | 2688 | hci_dev_unlock(hdev); |
2686 | 2689 | ||
2687 | return 0; | 2690 | return err; |
2688 | } | 2691 | } |
2689 | 2692 | ||
2690 | static const struct mgmt_handler { | 2693 | static const struct mgmt_handler { |