Commit 79c0868a authored by Jonas Dreßler's avatar Jonas Dreßler Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_event: Use HCI error defines instead of magic values 



We have error defines already, so let's use them.

Signed-off-by: default avatarJonas Dreßler <verdre@v0yd.nl>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 78e3639f

include/net/bluetooth/hci.h

+2 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ enum { 
#define HCI_ERROR_PIN_OR_KEY_MISSING	0x06

#define HCI_ERROR_MEMORY_EXCEEDED	0x07

#define HCI_ERROR_CONNECTION_TIMEOUT	0x08

#define HCI_ERROR_COMMAND_DISALLOWED	0x0c

#define HCI_ERROR_REJ_LIMITED_RESOURCES	0x0d

#define HCI_ERROR_REJ_BAD_ADDR		0x0f

#define HCI_ERROR_INVALID_PARAMETERS	0x12
@@ -661,6 +662,7 @@ enum { 
#define HCI_ERROR_REMOTE_POWER_OFF	0x15

#define HCI_ERROR_LOCAL_HOST_TERM	0x16

#define HCI_ERROR_PAIRING_NOT_ALLOWED	0x18

#define HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE	0x1e

#define HCI_ERROR_INVALID_LL_PARAMS	0x1e

#define HCI_ERROR_UNSPECIFIED		0x1f

#define HCI_ERROR_ADVERTISING_TIMEOUT	0x3c

net/bluetooth/hci_event.c

+4 −4
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ static u8 hci_cc_inquiry_cancel(struct hci_dev *hdev, void *data, 
	/* It is possible that we receive Inquiry Complete event right

	 * before we receive Inquiry Cancel Command Complete event, in

	 * which case the latter event should have status of Command

	 * Disallowed (0x0c). This should not be treated as error, since

	 * Disallowed. This should not be treated as error, since

	 * we actually achieve what Inquiry Cancel wants to achieve,

	 * which is to end the last Inquiry session.

	 */

	if (rp->status == 0x0c && !test_bit(HCI_INQUIRY, &hdev->flags)) {

	if (rp->status == HCI_ERROR_COMMAND_DISALLOWED && !test_bit(HCI_INQUIRY, &hdev->flags)) {

		bt_dev_warn(hdev, "Ignoring error of Inquiry Cancel command");

		rp->status = 0x00;

	}
@@ -2342,7 +2342,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) 


	if (status) {

		if (conn && conn->state == BT_CONNECT) {

			if (status != 0x0c || conn->attempt > 2) {

			if (status != HCI_ERROR_COMMAND_DISALLOWED || conn->attempt > 2) {

				conn->state = BT_CLOSED;

				hci_connect_cfm(conn, status);

				hci_conn_del(conn);
@@ -6682,7 +6682,7 @@ static void hci_le_remote_feat_complete_evt(struct hci_dev *hdev, void *data, 
			 * transition into connected state and mark it as

			 * successful.

			 */

			if (!conn->out && ev->status == 0x1a &&

			if (!conn->out && ev->status == HCI_ERROR_UNSUPPORTED_REMOTE_FEATURE &&

			    (hdev->le_features[0] & HCI_LE_PERIPHERAL_FEATURES))

				status = 0x00;

			else