Commit 48ec92fa authored by Alfonso Acosta's avatar Alfonso Acosta Committed by Marcel Holtmann
Browse files

Bluetooth: Refactor arguments of mgmt_device_connected 



The values of a lot of the mgmt_device_connected() parameters come
straight from a hci_conn object. We can simplify the function by passing
the full hci_conn pointer to it.

Signed-off-by: default avatarAlfonso Acosta <fons@spotify.com>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 866665f2

include/net/bluetooth/hci_core.h

+2 −3
Original line number Diff line number Diff line
@@ -1310,9 +1310,8 @@ int mgmt_update_adv_data(struct hci_dev *hdev); 
void mgmt_discoverable_timeout(struct hci_dev *hdev);

void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		       bool persistent);

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_connected(struct hci_dev *hdev, struct hci_conn *conn,

			   u32 flags, u8 *name, u8 name_len);

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

			      u8 link_type, u8 addr_type, u8 reason,

			      bool mgmt_connected);

net/bluetooth/hci_event.c

+4 −10
Original line number Diff line number Diff line
@@ -1577,8 +1577,7 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, 
	struct inquiry_entry *e;



	if (conn && !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

		mgmt_device_connected(hdev, bdaddr, ACL_LINK, 0x00, 0, name,

				      name_len, conn->dev_class);

		mgmt_device_connected(hdev, conn, 0, name, name_len);



	if (discov->state == DISCOVERY_STOPPED)

		return;
@@ -2536,9 +2535,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev, 
		cp.pscan_rep_mode = 0x02;

		hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp);

	} else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

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

				      conn->dst_type, 0, NULL, 0,

				      conn->dev_class);

		mgmt_device_connected(hdev, conn, 0, NULL, 0);



	if (!hci_outgoing_auth_needed(hdev, conn)) {

		conn->state = BT_CONNECTED;
@@ -3434,9 +3431,7 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev, 
		cp.pscan_rep_mode = 0x02;

		hci_send_cmd(hdev, HCI_OP_REMOTE_NAME_REQ, sizeof(cp), &cp);

	} else if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

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

				      conn->dst_type, 0, NULL, 0,

				      conn->dev_class);

		mgmt_device_connected(hdev, conn, 0, NULL, 0);



	if (!hci_outgoing_auth_needed(hdev, conn)) {

		conn->state = BT_CONNECTED;
@@ -4214,8 +4209,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	}



	if (!test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))

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

				      conn->dst_type, 0, NULL, 0, NULL);

		mgmt_device_connected(hdev, conn, 0, NULL, 0);



	conn->sec_level = BT_SECURITY_LOW;

	conn->handle = __le16_to_cpu(ev->handle);

net/bluetooth/l2cap_core.c

+1 −3
Original line number Diff line number Diff line
@@ -3873,9 +3873,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn, 
	hci_dev_lock(hdev);

	if (test_bit(HCI_MGMT, &hdev->dev_flags) &&

	    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags))

		mgmt_device_connected(hdev, &hcon->dst, hcon->type,

				      hcon->dst_type, 0, NULL, 0,

				      hcon->dev_class);

		mgmt_device_connected(hdev, hcon, 0, NULL, 0);

	hci_dev_unlock(hdev);



	l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);

net/bluetooth/mgmt.c

+6 −7
Original line number Diff line number Diff line
@@ -6171,16 +6171,15 @@ static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, 
	return eir_len;

}



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_connected(struct hci_dev *hdev, struct hci_conn *conn,

			   u32 flags, u8 *name, u8 name_len)

{

	char buf[512];

	struct mgmt_ev_device_connected *ev = (void *) buf;

	u16 eir_len = 0;



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

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

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

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



	ev->flags = __cpu_to_le32(flags);
@@ -6188,9 +6187,9 @@ void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
		eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE,

					  name, name_len);



	if (dev_class && memcmp(dev_class, "\0\0\0", 3) != 0)

	if (conn->dev_class && memcmp(conn->dev_class, "\0\0\0", 3) != 0)

		eir_len = eir_append_data(ev->eir, eir_len,

					  EIR_CLASS_OF_DEV, dev_class, 3);

					  EIR_CLASS_OF_DEV, conn->dev_class, 3);



	ev->eir_len = cpu_to_le16(eir_len);