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

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

Bluetooth: Use hdev->init/resp_addr values for smp_c1 function 



Now that we have nicely tracked values of the initiator and responder
address information we can pass that directly to the smp_c1 function
without worrying e.g. about who initiated the connection. This patch
updates the two places in smp.c to use the new variables.

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

net/bluetooth/smp.c

+6 −16
Original line number Diff line number Diff line
@@ -445,14 +445,9 @@ static void confirm_work(struct work_struct *work) 
	/* Prevent mutual access to hdev->tfm_aes */

	hci_dev_lock(hdev);



	if (conn->hcon->out)

	ret = smp_c1(tfm, smp->tk, smp->prnd, smp->preq, smp->prsp,

			     conn->hcon->src_type, &conn->hcon->src,

			     conn->hcon->dst_type, &conn->hcon->dst, res);

	else

		ret = smp_c1(tfm, smp->tk, smp->prnd, smp->preq, smp->prsp,

			     conn->hcon->dst_type, &conn->hcon->dst,

			     conn->hcon->src_type, &conn->hcon->src, res);

		     conn->hcon->init_addr_type, &conn->hcon->init_addr,

		     conn->hcon->resp_addr_type, &conn->hcon->resp_addr, res);



	hci_dev_unlock(hdev);
@@ -492,14 +487,9 @@ static void random_work(struct work_struct *work) 
	/* Prevent mutual access to hdev->tfm_aes */

	hci_dev_lock(hdev);



	if (hcon->out)

		ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp,

			     hcon->src_type, &hcon->src,

			     hcon->dst_type, &hcon->dst, res);

	else

	ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp,

			     hcon->dst_type, &hcon->dst,

			     hcon->src_type, &hcon->src, res);

		     hcon->init_addr_type, &hcon->init_addr,

		     hcon->resp_addr_type, &hcon->resp_addr, res);



	hci_dev_unlock(hdev);