diff options
| author | Andre Guedes | 2012-07-27 20:10:15 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-08-06 20:08:10 +0200 |
| commit | b47a09b33a4612ace2958996ce6e0134be23d043 (patch) | |
| tree | d6ad5e962e2b660ffa503def373719309c39b59f /net/bluetooth | |
| parent | Bluetooth: Find hci_conn by BT_CONNECT state (diff) | |
| download | kernel-qcow2-linux-b47a09b33a4612ace2958996ce6e0134be23d043.tar.gz kernel-qcow2-linux-b47a09b33a4612ace2958996ce6e0134be23d043.tar.xz kernel-qcow2-linux-b47a09b33a4612ace2958996ce6e0134be23d043.zip | |
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 8dc1f0fbe9c1..92522b470f6b 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) hci_dev_lock(hdev); + conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT); + if (ev->status) { - conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT); if (!conn) goto unlock; @@ -3346,7 +3347,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) goto unlock; } - conn = hci_conn_hash_lookup_ba(hdev, LE_LINK, &ev->bdaddr); if (!conn) { conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr); if (!conn) { |