Skip to content

Commit

Permalink
Bluetooth: Remove redundant hci_dev comparisons in mgmt lookups
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johan Hedberg authored and Gustavo F. Padovan committed Nov 9, 2011
1 parent fc2f4b1 commit 2aeabcb
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 2aeabcb

Please sign in to comment.