Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1707c60e authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Simplify address parameters of user_pairing_resp() 



Instead of passing the bdaddr and bdaddr_type as separate parameters to
user_pairing_resp it's simpler to just pass the original mgmt_addr_info
struct which contains both values.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 4c01f8b8

net/bluetooth/mgmt.c

+14 −13
Original line number Diff line number Diff line
@@ -2300,7 +2300,7 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
}



static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,

			     bdaddr_t *bdaddr, u8 type, u16 mgmt_op,

			     struct mgmt_addr_info *addr, u16 mgmt_op,

			     u16 hci_op, __le32 passkey)

{

	struct pending_cmd *cmd;
@@ -2315,10 +2315,10 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
		goto done;

	}



	if (type == BDADDR_BREDR)

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, bdaddr);

	if (addr->type == BDADDR_BREDR)

		conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &addr->bdaddr);

	else

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, bdaddr);

		conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &addr->bdaddr);



	if (!conn) {

		err = cmd_status(sk, hdev->id, mgmt_op,
@@ -2326,7 +2326,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
		goto done;

	}



	if (type == BDADDR_LE_PUBLIC || type == BDADDR_LE_RANDOM) {

	if (addr->type == BDADDR_LE_PUBLIC || addr->type == BDADDR_LE_RANDOM) {

		/* Continue with pairing via SMP */

		err = smp_user_confirm_reply(conn, mgmt_op, passkey);
@@ -2340,7 +2340,7 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
		goto done;

	}



	cmd = mgmt_pending_add(sk, mgmt_op, hdev, bdaddr, sizeof(*bdaddr));

	cmd = mgmt_pending_add(sk, mgmt_op, hdev, addr, sizeof(*addr));

	if (!cmd) {

		err = -ENOMEM;

		goto done;
@@ -2350,11 +2350,12 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
	if (hci_op == HCI_OP_USER_PASSKEY_REPLY) {

		struct hci_cp_user_passkey_reply cp;



		bacpy(&cp.bdaddr, bdaddr);

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

		cp.passkey = passkey;

		err = hci_send_cmd(hdev, hci_op, sizeof(cp), &cp);

	} else

		err = hci_send_cmd(hdev, hci_op, sizeof(*bdaddr), bdaddr);

		err = hci_send_cmd(hdev, hci_op, sizeof(addr->bdaddr),

				   &addr->bdaddr);



	if (err < 0)

		mgmt_pending_remove(cmd);
@@ -2371,7 +2372,7 @@ static int pin_code_neg_reply(struct sock *sk, struct hci_dev *hdev, 


	BT_DBG("");



	return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,

	return user_pairing_resp(sk, hdev, &cp->addr,

				MGMT_OP_PIN_CODE_NEG_REPLY,

				HCI_OP_PIN_CODE_NEG_REPLY, 0);

}
@@ -2387,7 +2388,7 @@ static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data, 
		return cmd_status(sk, hdev->id, MGMT_OP_USER_CONFIRM_REPLY,

				  MGMT_STATUS_INVALID_PARAMS);



	return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,

	return user_pairing_resp(sk, hdev, &cp->addr,

				 MGMT_OP_USER_CONFIRM_REPLY,

				 HCI_OP_USER_CONFIRM_REPLY, 0);

}
@@ -2399,7 +2400,7 @@ static int user_confirm_neg_reply(struct sock *sk, struct hci_dev *hdev, 


	BT_DBG("");



	return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,

	return user_pairing_resp(sk, hdev, &cp->addr,

				 MGMT_OP_USER_CONFIRM_NEG_REPLY,

				 HCI_OP_USER_CONFIRM_NEG_REPLY, 0);

}
@@ -2411,7 +2412,7 @@ static int user_passkey_reply(struct sock *sk, struct hci_dev *hdev, void *data, 


	BT_DBG("");



	return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,

	return user_pairing_resp(sk, hdev, &cp->addr,

				 MGMT_OP_USER_PASSKEY_REPLY,

				 HCI_OP_USER_PASSKEY_REPLY, cp->passkey);

}
@@ -2423,7 +2424,7 @@ static int user_passkey_neg_reply(struct sock *sk, struct hci_dev *hdev, 


	BT_DBG("");



	return user_pairing_resp(sk, hdev, &cp->addr.bdaddr, cp->addr.type,

	return user_pairing_resp(sk, hdev, &cp->addr,

				 MGMT_OP_USER_PASSKEY_NEG_REPLY,

				 HCI_OP_USER_PASSKEY_NEG_REPLY, 0);

}