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

Commit f950a30e authored by Szymon Janc's avatar Szymon Janc Committed by Gustavo Padovan
Browse files

Bluetooth: Fix pair device command reply if adapter is powered off 



According to Bluetooth Management API specification Pair Device Command
should generate command complete event on both success and failure.
This fix replying with command status (which lacks address info) when
adapter is powered off.

Signed-off-by: default avatarSzymon Janc <szymon.janc@tieto.com>
Acked-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent fe038884

net/bluetooth/mgmt.c

+6 −6
Original line number Diff line number Diff line
@@ -1939,11 +1939,15 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 


	BT_DBG("");



	memset(&rp, 0, sizeof(rp));

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

	rp.addr.type = cp->addr.type;



	hci_dev_lock(hdev);



	if (!hdev_is_powered(hdev)) {

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

				 MGMT_STATUS_NOT_POWERED);

		err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,

				   MGMT_STATUS_NOT_POWERED, &rp, sizeof(rp));

		goto unlock;

	}
@@ -1960,10 +1964,6 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr,

				   cp->addr.type, sec_level, auth_type);



	memset(&rp, 0, sizeof(rp));

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

	rp.addr.type = cp->addr.type;



	if (IS_ERR(conn)) {

		int status;