iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg 2011-11-03 14:40:33 +02:00 committed by Gustavo F. Padovan
parent 08add513ca
commit b24752fe65
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/bluetooth/mgmt.c
View File

@ -262,7 +262,7 @@ static void mgmt_pending_foreach(u16 opcode, int index,
cmd = list_entry(p, struct pending_cmd, list); cmd = list_entry(p, struct pending_cmd, list);
if (cmd->opcode != opcode) if (opcode > 0 && cmd->opcode != opcode)
continue; continue;
if (index >= 0 && cmd->index != index) if (index >= 0 && cmd->index != index)
@ -1949,6 +1949,14 @@ done:
return err; 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) int mgmt_index_added(u16 index)
{ {
return mgmt_event(MGMT_EV_INDEX_ADDED, index, NULL, 0, NULL); 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) 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); 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); 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; ev.val = powered;
ret = mgmt_event(MGMT_EV_POWERED, index, &ev, sizeof(ev), match.sk); ret = mgmt_event(MGMT_EV_POWERED, index, &ev, sizeof(ev), match.sk);