Bluetooth: Add a role parameter to hci_conn_add()

We need to be able to track slave vs master LE connections in
hci_conn_hash, and to be able to do that we need to know the role of the
connection by the time hci_conn_add_has() is called. This means in
practice the hci_conn_add() call that creates the hci_conn_object.

This patch adds a new role parameter to hci_conn_add() function to give
the object its initial role value, and updates the callers to pass the
appropriate role to it. Since the function now takes care of
initializing both conn->role and conn->out values we can remove some
other unnecessary assignments.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 6 insertions, 11 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 5f7fd410fb3b..c68b93e11686 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1414,11 +1414,9 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
                 }
         } else {
                 if (!conn) {
-                        conn = hci_conn_add(hdev, ACL_LINK, &cp->bdaddr);
-                        if (conn) {
-                                conn->out  = true;
-                                conn->role = HCI_ROLE_MASTER;
-                        } else
+                        conn = hci_conn_add(hdev, ACL_LINK, &cp->bdaddr,
+                                            HCI_ROLE_MASTER);
+                        if (!conn)
                                 BT_ERR("No memory for new connection");
                 }
         }
@@ -2156,7 +2154,8 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
         conn = hci_conn_hash_lookup_ba(hdev, ev->link_type,
                         &ev->bdaddr);
         if (!conn) {
-                conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr);
+                conn = hci_conn_add(hdev, ev->link_type, &ev->bdaddr,
+                                    HCI_ROLE_SLAVE);
                 if (!conn) {
                         BT_ERR("No memory for new connection");
                         hci_dev_unlock(hdev);
@@ -4100,7 +4099,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
         conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
         if (!conn) {
-                conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr);
+                conn = hci_conn_add(hdev, LE_LINK, &ev->bdaddr, ev->role);
                 if (!conn) {
                         BT_ERR("No memory for new connection");
                         goto unlock;
@@ -4108,10 +4107,6 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
                 conn->dst_type = ev->bdaddr_type;
 
-                conn->role = ev->role;
-                if (conn->role == HCI_ROLE_MASTER)
-                        conn->out = true;
-
                 /* If we didn't have a hci_conn object previously
                  * but we're in master role this must be something
                  * initiated using a white list. Since white list based