diff options
author | Andre Guedes <andre.guedes@openbossa.org> | 2012-07-27 14:10:15 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-08-06 14:08:10 -0400 |
commit | b47a09b33a4612ace2958996ce6e0134be23d043 (patch) | |
tree | d6ad5e962e2b660ffa503def373719309c39b59f /net/bluetooth | |
parent | 0c95ab78be36e56ca69e36bc679f9dfd3d25f31e (diff) |
Bluetooth: Lookup hci_conn in hci_le_conn_complete_evt
This patch does a trivial code refactoring in hci_conn lookup in
hci_le_conn_complete_evt. It performs the hci_conn lookup at the
begining of the function since it is used by both flows (error
and success).
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 8dc1f0fbe9c..92522b470f6 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -3333,8 +3333,9 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3333 | 3333 | ||
3334 | hci_dev_lock(hdev); | 3334 | hci_dev_lock(hdev); |
3335 | 3335 | ||
3336 | conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT); | ||
3337 | |||
3336 | if (ev->status) { | 3338 | if (ev->status) { |
3337 | conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT); | ||
3338 | if (!conn) | 3339 | if (!conn) |
3339 | goto unlock; | 3340 | goto unlock; |
3340 | 3341 | ||
@@ -3346,7 +3347,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
3346 | goto unlock; | 3347 | goto unlock; |
3347 | } | 3348 | } |
3348 | 3349 | ||
3349 | conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &ev->bdaddr); | ||
3350 | if (!conn) { | 3350 | if (!conn) { |
3351 | conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); | 3351 | conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); |
3352 | if (!conn) { | 3352 | if (!conn) { |