Commit d47da6bd authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: hci_core: Fix sending MGMT_EV_CONNECT_FAILED 



If HCI_CONN_MGMT_CONNECTED has been set then the event shall be
HCI_CONN_MGMT_DISCONNECTED.

Fixes: b644ba33 ("Bluetooth: Update device_connected and device_found events to latest API")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 9a057094

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -2257,8 +2257,8 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr, 
			      bool mgmt_connected);

void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,

			    u8 link_type, u8 addr_type, u8 status);

void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			 u8 addr_type, u8 status);

void mgmt_connect_failed(struct hci_dev *hdev, struct hci_conn *conn,

			 u8 status);

void mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);

void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				  u8 status);

net/bluetooth/hci_conn.c

+2 −4
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ void hci_connect_le_scan_cleanup(struct hci_conn *conn, u8 status) 
	 * where a timeout + cancel does indicate an actual failure.

	 */

	if (status && status != HCI_ERROR_UNKNOWN_CONN_ID)

		mgmt_connect_failed(hdev, &conn->dst, conn->type,

				    conn->dst_type, status);

		mgmt_connect_failed(hdev, conn, status);



	/* The connection attempt was doing scan for new RPA, and is

	 * in scan phase. If params are not associated with any other
@@ -1249,8 +1248,7 @@ void hci_conn_failed(struct hci_conn *conn, u8 status) 
		hci_le_conn_failed(conn, status);

		break;

	case ACL_LINK:

		mgmt_connect_failed(hdev, &conn->dst, conn->type,

				    conn->dst_type, status);

		mgmt_connect_failed(hdev, conn, status);

		break;

	}

net/bluetooth/mgmt.c

+9 −4
Original line number Diff line number Diff line
@@ -9779,13 +9779,18 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	mgmt_pending_remove(cmd);

}



void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			 u8 addr_type, u8 status)

void mgmt_connect_failed(struct hci_dev *hdev, struct hci_conn *conn, u8 status)

{

	struct mgmt_ev_connect_failed ev;



	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	if (test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) {

		mgmt_device_disconnected(hdev, &conn->dst, conn->type,

					 conn->dst_type, status, true);

		return;

	}



	bacpy(&ev.addr.bdaddr, &conn->dst);

	ev.addr.type = link_to_bdaddr(conn->type, conn->dst_type);

	ev.status = mgmt_status(status);



	mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL);