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

Commit afeb019d authored by Jaganath Kanakkassery's avatar Jaganath Kanakkassery Committed by Gustavo Padovan
Browse files

Bluetooth: Refactor PIN code rejection to use user_pairing_resp() 



Reuse user_pairing_resp() to send PIN code negative reply

Signed-off-by: default avatarJaganath Kanakkassery <jaganath.k@samsung.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 2c2453f3

net/bluetooth/mgmt.c

+12 −23
Original line number Diff line number Diff line
@@ -1778,29 +1778,6 @@ static int pin_code_reply(struct sock *sk, struct hci_dev *hdev, void *data, 
	return err;

}



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

			      void *data, u16 len)

{

	struct mgmt_cp_pin_code_neg_reply *cp = data;

	int err;



	BT_DBG("");



	hci_dev_lock(hdev);



	if (!hdev_is_powered(hdev)) {

		err = cmd_status(sk, hdev->id, MGMT_OP_PIN_CODE_NEG_REPLY,

				 MGMT_STATUS_NOT_POWERED);

		goto failed;

	}



	err = send_pin_code_neg_reply(sk, hdev, cp);



failed:

	hci_dev_unlock(hdev);

	return err;

}



static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,

			     u16 len)

{
@@ -2083,6 +2060,18 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev, 
	return err;

}



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

			      void *data, u16 len)

{

	struct mgmt_cp_pin_code_neg_reply *cp = data;



	BT_DBG("");



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

				MGMT_OP_PIN_CODE_NEG_REPLY,

				HCI_OP_PIN_CODE_NEG_REPLY, 0);

}



static int user_confirm_reply(struct sock *sk, struct hci_dev *hdev, void *data,

			      u16 len)

{