The following commit has been merged in the batman-adv/next branch: commit b47a09b33a4612ace2958996ce6e0134be23d043 Author: Andre Guedes andre.guedes@openbossa.org Date: Fri Jul 27 15:10:15 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@openbossa.org Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk
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) {