From: Johan Hedberg <johan.hedberg@intel.com>
Date: Sun, 20 Jan 2013 12:27:14 +0000 (+0200)
Subject: Bluetooth: Fix returning proper mgmt status for Load LTKs
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e57e619f463e7841940ef1b98969e23f71f5ee8a;p=deliverable%2Flinux.git

Bluetooth: Fix returning proper mgmt status for Load LTKs

Failures of mgmt commands should be indicated with valid mgmt status
codes, and EINVAL is not one of them. Instead MGMT_STATUS_INVALID_PARAMS
should be returned.

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>
---

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index d9b042efbf42..a050eee61623 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2716,7 +2716,7 @@ static int load_long_term_keys(struct sock *sk, struct hci_dev *hdev,
 		BT_ERR("load_keys: expected %u bytes, got %u bytes",
 		       len, expected_len);
 		return cmd_status(sk, hdev->id, MGMT_OP_LOAD_LONG_TERM_KEYS,
-				  EINVAL);
+				  MGMT_STATUS_INVALID_PARAMS);
 	}
 
 	BT_DBG("%s key_count %u", hdev->name, key_count);