Bluetooth: AMP: Factor out phylink_add

Add direction parameter to phylink_add since it is anyway set later.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

3 files changed, 7 insertions, 5 deletions

diff --git a/include/net/bluetooth/amp.h b/include/net/bluetooth/amp.h
index ae2c3e53647..2e7c79ea046 100644
--- a/include/net/bluetooth/amp.h
+++ b/include/net/bluetooth/amp.h
@@ -31,7 +31,7 @@ struct amp_ctrl *amp_ctrl_lookup(struct amp_mgr *mgr, u8 id);
 void amp_ctrl_list_flush(struct amp_mgr *mgr);
 
 struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
-                             u8 remote_id);
+                             u8 remote_id, bool out);
 
 int phylink_gen_key(struct hci_conn *hcon, u8 *data, u8 *len, u8 *type);
 
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
index 88a4b583d21..3ff4dc928bf 100644
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
@@ -417,7 +417,7 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
         if (!hdev)
                 return -EINVAL;
 
-        hcon = phylink_add(hdev, mgr, rsp->id);
+        hcon = phylink_add(hdev, mgr, rsp->id, true);
         if (!hcon)
                 goto done;
 
@@ -487,7 +487,7 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
                 amp_ctrl_put(ctrl);
         }
 
-        hcon = phylink_add(hdev, mgr, req->local_id);
+        hcon = phylink_add(hdev, mgr, req->local_id, false);
         if (hcon) {
                 amp_accept_phylink(hdev, mgr, hcon);
                 rsp.status = A2MP_STATUS_SUCCESS;
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index 2fc5562a84b..59da0f15818 100644
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -108,7 +108,7 @@ static u8 __next_handle(struct amp_mgr *mgr)
 }
 
 struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
-                             u8 remote_id)
+                             u8 remote_id, bool out)
 {
         bdaddr_t *dst = mgr->l2cap_conn->dst;
         struct hci_conn *hcon;
@@ -117,12 +117,14 @@ struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
         if (!hcon)
                 return NULL;
 
+        BT_DBG("hcon %p dst %pMR", hcon, dst);
+
         hcon->state = BT_CONNECT;
-        hcon->out = true;
         hcon->attempt++;
         hcon->handle = __next_handle(mgr);
         hcon->remote_id = remote_id;
         hcon->amp_mgr = mgr;
+        hcon->out = out;
 
         return hcon;
 }