openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: Remove redundant hci_dev comparisons in mgmt lookups 

Now that pending commands are hci_dev specific there's no need to check
whether a command matches hci_dev when iterating through them.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg 2011-11-09 13:58:57 +02:00 committed by Gustavo F. Padovan
parent fc2f4b13d8
commit 2aeabcbedd
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/bluetooth/mgmt.c
View File

@ -268,9 +268,6 @@ static void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev,
if (opcode > 0 && cmd->opcode != opcode)
continue;
if (hdev && cmd->index != hdev->id)
continue;
cb(cmd, data);
}
}
@ -280,13 +277,8 @@ static struct pending_cmd *mgmt_pending_find(u16 opcode, struct hci_dev *hdev)
struct pending_cmd *cmd;
list_for_each_entry(cmd, &hdev->mgmt_pending, list) {
if (cmd->opcode != opcode)
continue;
if (hdev && cmd->index != hdev->id)
continue;
return cmd;
if (cmd->opcode == opcode)
return cmd;
}
return NULL;
@ -1300,9 +1292,6 @@ static inline struct pending_cmd *find_pairing(struct hci_conn *conn)
if (cmd->opcode != MGMT_OP_PAIR_DEVICE)
continue;
if (cmd->index != hdev->id)
continue;
if (cmd->user_data != conn)
continue;