Bluetooth: Lookup hci_conn in hci_le_conn_complete_evt

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=b47a09b33a4612ace2958996ce6e0134be23d043
Commit:     b47a09b33a4612ace2958996ce6e0134be23d043
Parent:     0c95ab78be36e56ca69e36bc679f9dfd3d25f31e
Author:     Andre Guedes <andre.guedes at openbossa.org>
AuthorDate: Fri Jul 27 15:10:15 2012 -0300
Committer:  Gustavo Padovan <gustavo.padovan at collabora.co.uk>
CommitDate: Mon Aug 6 15:08:10 2012 -0300

    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 at openbossa.org>
    Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
---
 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 8dc1f0f..92522b4 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) {