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>
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index a849428..a6720c6 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -268,9 +268,6 @@
if (opcode > 0 && cmd->opcode != opcode)
continue;
- if (hdev && cmd->index != hdev->id)
- continue;
-
cb(cmd, data);
}
}
@@ -280,13 +277,8 @@
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 @@
if (cmd->opcode != MGMT_OP_PAIR_DEVICE)
continue;
- if (cmd->index != hdev->id)
- continue;
-
if (cmd->user_data != conn)
continue;