summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2011-11-09 13:58:57 +0200
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-09 12:48:47 -0200
commit2aeabcbedd51aef94b61d05b57246d1db4984453 (patch)
tree5e345ebc1eada08264caa8c552e6655a94e18c02 /net
parentfc2f4b13d8c91713efb972be42566f7f3625f5ed (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index a849428ffbc..a6720c6a4d2 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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;