Return-Path: From: Andrei Emeltchenko To: linux-bluetooth@vger.kernel.org Subject: [RFCv3 15/20] Bluetooth: AMP: Create Physical Link Date: Mon, 13 Aug 2012 16:50:33 +0300 Message-Id: <1344865838-9165-16-git-send-email-Andrei.Emeltchenko.news@gmail.com> In-Reply-To: <1344865838-9165-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> References: <1340981212-21709-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> <1344865838-9165-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Andrei Emeltchenko When receiving A2MP Get AMP Assoc Response execute HCI Create Physical Link to AMP controller. Define callback which will run when receiving HCI Command Status. Signed-off-by: Andrei Emeltchenko --- include/net/bluetooth/amp.h | 4 ++++ include/net/bluetooth/pal.h | 1 - net/bluetooth/a2mp.c | 4 ++++ net/bluetooth/amp.c | 31 +++++++++++++++++++++++++++++++ net/bluetooth/hci_event.c | 11 +++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/include/net/bluetooth/amp.h b/include/net/bluetooth/amp.h index e861675..b376cc3 100644 --- a/include/net/bluetooth/amp.h +++ b/include/net/bluetooth/amp.h @@ -14,8 +14,12 @@ #ifndef __AMP_H #define __AMP_H +#include + void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr); void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle); void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr); +void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr, + struct phy_link *plink); #endif /* __AMP_H */ diff --git a/include/net/bluetooth/pal.h b/include/net/bluetooth/pal.h index 8799285..d9eb87e 100644 --- a/include/net/bluetooth/pal.h +++ b/include/net/bluetooth/pal.h @@ -18,7 +18,6 @@ #include #include #include -#include struct phy_link { struct list_head list; diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index c252c63..fedfdb9 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -378,9 +378,13 @@ static int a2mp_getampassoc_rsp(struct amp_mgr *mgr, struct sk_buff *skb, plink = phylink_add(mgr, hdev->id, rsp->id, ctrl->assoc, ctrl->assoc_len); + if (!plink) + goto done; BT_DBG("Created plink %p: loc:%d -> rem:%d", plink, hdev->id, rsp->id); + amp_create_phylink(hdev, mgr, plink); + done: skb_pull(skb, len); return 0; diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c index 725a9f0..7f2c0fa 100644 --- a/net/bluetooth/amp.c +++ b/net/bluetooth/amp.c @@ -17,6 +17,7 @@ #include #include #include +#include static void amp_read_loc_info_complete_cb(struct hci_dev *hdev, struct hci_cb_cmd *cmd) @@ -122,3 +123,33 @@ void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr) &cp, amp_read_loc_assoc_complete_cb, mgr, cb_destructor, GFP_KERNEL); } + +static void amp_create_phylink_cs_cb(struct hci_dev *hdev, + struct hci_cb_cmd *cmd) +{ + struct amp_mgr *mgr = cmd->opt; + + BT_DBG("mgr %p", mgr); + + /* Write Remote AMP Assoc */ +} + +void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr, + struct phy_link *plink) +{ + struct hci_cp_create_phy_link cp; + + cp.phy_handle = plink->handle; + + if (phylink_gen_key(mgr->l2cap_conn->hcon, cp.key, &cp.key_len, + &cp.key_type)) { + BT_DBG("Cannot create link key"); + return; + } + + amp_mgr_get(mgr); + + hci_callback_send_cmd(hdev, HCI_OP_CREATE_PHY_LINK, sizeof(cp), &cp, + amp_create_phylink_cs_cb, mgr, cb_destructor, + GFP_KERNEL); +} diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 5f68c70..8110b94 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1685,6 +1685,13 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status) BT_DBG("%s status 0x%2.2x", hdev->name, status); } +static void hci_cs_create_phylink(struct hci_dev *hdev, u8 status) +{ + BT_DBG("%s status 0x%2.2x", hdev->name, status); + + hci_callback_process(hdev, HCI_OP_CREATE_PHY_LINK, status); +} + static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) { __u8 status = *((__u8 *) skb->data); @@ -2475,6 +2482,10 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) hci_cs_le_start_enc(hdev, ev->status); break; + case HCI_OP_CREATE_PHY_LINK: + hci_cs_create_phylink(hdev, ev->status); + break; + default: BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode); break; -- 1.7.9.5