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

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

Bluetooth: Fix mgmt response when adapter goes down or is removed 



When an adapter gets powered off or is removed any pending commands
should receive a ENETDOWN or ENODEV status response.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 08add513

net/bluetooth/mgmt.c

+18 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void mgmt_pending_foreach(u16 opcode, int index, 


		cmd = list_entry(p, struct pending_cmd, list);



		if (cmd->opcode != opcode)

		if (opcode > 0 && cmd->opcode != opcode)

			continue;



		if (index >= 0 && cmd->index != index)
@@ -1949,6 +1949,14 @@ done: 
	return err;

}



static void cmd_status_rsp(struct pending_cmd *cmd, void *data)

{

	u8 *status = data;



	cmd_status(cmd->sk, cmd->index, cmd->opcode, *status);

	mgmt_pending_remove(cmd);

}



int mgmt_index_added(u16 index)

{

	return mgmt_event(MGMT_EV_INDEX_ADDED, index, NULL, 0, NULL);
@@ -1956,6 +1964,10 @@ int mgmt_index_added(u16 index) 


int mgmt_index_removed(u16 index)

{

	u8 status = ENODEV;



	mgmt_pending_foreach(0, index, cmd_status_rsp, &status);



	return mgmt_event(MGMT_EV_INDEX_REMOVED, index, NULL, 0, NULL);

}
@@ -1992,6 +2004,11 @@ int mgmt_powered(u16 index, u8 powered) 


	mgmt_pending_foreach(MGMT_OP_SET_POWERED, index, mode_rsp, &match);



	if (!powered) {

		u8 status = ENETDOWN;

		mgmt_pending_foreach(0, index, cmd_status_rsp, &status);

	}



	ev.val = powered;



	ret = mgmt_event(MGMT_EV_POWERED, index, &ev, sizeof(ev), match.sk);