summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-01-09 15:29:34 +0200
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-01-10 06:08:35 -0200
commit715a5bf2db4df4a7df64f420d21fb49ba146b3fa (patch)
treefb1e9524e6781ebda12f4d9500f0ef554d207ea7 /net/bluetooth
parente384662b1c1004e6b1e9d2c4979945a383c07b7d (diff)
downloadop-kernel-dev-715a5bf2db4df4a7df64f420d21fb49ba146b3fa.zip
op-kernel-dev-715a5bf2db4df4a7df64f420d21fb49ba146b3fa.tar.gz
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/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 577f316..1dd41d4 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,
{
struct mgmt_cp_load_long_term_keys *cp = cp_data;
u16 key_count, expected_len;
- int i;
+ int i, err;
key_count = __le16_to_cpu(cp->key_count);
@@ -2682,9 +2682,12 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
key->enc_size, key->ediv, key->rand);
}
+ err = cmd_complete(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, 0,
+ NULL, 0);
+
hci_dev_unlock(hdev);
- return 0;
+ return err;
}
static const struct mgmt_handler {
OpenPOWER on IntegriCloud