Commit 12d4a3b2 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Move check for MGMT_CONNECTED flag into mgmt.c 



Once mgmt_set_powered(off) starts doing disconnections we'll need to
care about any disconnections in mgmt.c and not just those with the
MGMT_CONNECTED flag set. Therefore, move the check into mgmt.c from
hci_event.c.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 778b235a

include/net/bluetooth/hci_core.h

+2 −1
Original line number Diff line number Diff line
@@ -1182,7 +1182,8 @@ void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
			   u8 addr_type, u32 flags, u8 *name, u8 name_len,

			   u8 *dev_class);

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

			      u8 link_type, u8 addr_type, u8 reason);

			      u8 link_type, u8 addr_type, u8 reason,

			      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,

net/bluetooth/hci_event.c

+4 −3
Original line number Diff line number Diff line
@@ -1842,6 +1842,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	struct hci_ev_disconn_complete *ev = (void *) skb->data;

	u8 reason = hci_to_mgmt_reason(ev->reason);

	struct hci_conn *conn;

	bool mgmt_connected;

	u8 type;



	BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
@@ -1860,9 +1861,9 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 


	conn->state = BT_CLOSED;



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

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

					 conn->dst_type, reason);

	mgmt_connected = test_and_clear_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags);

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

				reason, mgmt_connected);



	if (conn->type == ACL_LINK && conn->flush_key)

		hci_remove_link_key(hdev, &conn->dst);

net/bluetooth/mgmt.c

+5 −1
Original line number Diff line number Diff line
@@ -5012,11 +5012,15 @@ static void unpair_device_rsp(struct pending_cmd *cmd, void *data) 
}



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

			      u8 link_type, u8 addr_type, u8 reason)

			      u8 link_type, u8 addr_type, u8 reason,

			      bool mgmt_connected)

{

	struct mgmt_ev_device_disconnected ev;

	struct sock *sk = NULL;



	if (!mgmt_connected)

		return;



	if (link_type != ACL_LINK && link_type != LE_LINK)

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE