diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-03-07 08:04:13 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-07 12:49:12 -0500 |
commit | 2606ecbc4880b8641b5e455c80f4bd72c223ce86 (patch) | |
tree | d769b1d7f2d38e480a4d26e8b967ecd5a30b8199 /net/bluetooth/mgmt.c | |
parent | ca58e594da2486c1d28e7ad547d82266604ec4ce (diff) |
Bluetooth: Fix expected key count debug logs
The debug logs for reporting a discrepancy between the expected amount
of keys and the actually received amount of keys got these value mixed
up. This patch fixes the issue.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 98e9df3556e7..f2397e7ad385 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -2351,7 +2351,7 @@ static int load_link_keys(struct sock *sk, struct hci_dev *hdev, void *data, | |||
2351 | sizeof(struct mgmt_link_key_info); | 2351 | sizeof(struct mgmt_link_key_info); |
2352 | if (expected_len != len) { | 2352 | if (expected_len != len) { |
2353 | BT_ERR("load_link_keys: expected %u bytes, got %u bytes", | 2353 | BT_ERR("load_link_keys: expected %u bytes, got %u bytes", |
2354 | len, expected_len); | 2354 | expected_len, len); |
2355 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS, | 2355 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LINK_KEYS, |
2356 | MGMT_STATUS_INVALID_PARAMS); | 2356 | MGMT_STATUS_INVALID_PARAMS); |
2357 | } | 2357 | } |
@@ -4427,7 +4427,7 @@ static int load_irks(struct sock *sk, struct hci_dev *hdev, void *cp_data, | |||
4427 | expected_len = sizeof(*cp) + irk_count * sizeof(struct mgmt_irk_info); | 4427 | expected_len = sizeof(*cp) + irk_count * sizeof(struct mgmt_irk_info); |
4428 | if (expected_len != len) { | 4428 | if (expected_len != len) { |
4429 | BT_ERR("load_irks: expected %u bytes, got %u bytes", | 4429 | BT_ERR("load_irks: expected %u bytes, got %u bytes", |
4430 | len, expected_len); | 4430 | expected_len, len); |
4431 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_IRKS, | 4431 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_IRKS, |
4432 | MGMT_STATUS_INVALID_PARAMS); | 4432 | MGMT_STATUS_INVALID_PARAMS); |
4433 | } | 4433 | } |
@@ -4507,7 +4507,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev, | |||
4507 | sizeof(struct mgmt_ltk_info); | 4507 | sizeof(struct mgmt_ltk_info); |
4508 | if (expected_len != len) { | 4508 | if (expected_len != len) { |
4509 | BT_ERR("load_keys: expected %u bytes, got %u bytes", | 4509 | BT_ERR("load_keys: expected %u bytes, got %u bytes", |
4510 | len, expected_len); | 4510 | expected_len, len); |
4511 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, | 4511 | return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS, |
4512 | MGMT_STATUS_INVALID_PARAMS); | 4512 | MGMT_STATUS_INVALID_PARAMS); |
4513 | } | 4513 | } |