Return-Path: MIME-Version: 1.0 In-Reply-To: References: <1391639006-26311-1-git-send-email-andre.guedes@openbossa.org> <1391639006-26311-2-git-send-email-andre.guedes@openbossa.org> From: Andre Guedes Date: Mon, 17 Feb 2014 17:24:27 -0300 Message-ID: Subject: Re: [RFC v8 02/10] Bluetooth: Declare le_conn_failed in hci_core.h To: Marcel Holtmann Cc: "bluez mailin list (linux-bluetooth@vger.kernel.org)" Content-Type: text/plain; charset=ISO-8859-1 List-ID: Hi Marcel, On Fri, Feb 14, 2014 at 7:26 PM, Marcel Holtmann wrote: > Hi Andre, > >> This patch adds the "hci_" prefix to le_conn_failed() helper and >> declares it in hci_core.h so it can be reused in hci_event.c. >> >> Signed-off-by: Andre Guedes >> --- >> include/net/bluetooth/hci_core.h | 2 ++ >> net/bluetooth/hci_conn.c | 4 ++-- >> net/bluetooth/hci_event.c | 6 +----- >> 3 files changed, 5 insertions(+), 7 deletions(-) >> >> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h >> index 8aff7f9..6e5062c 100644 >> --- a/include/net/bluetooth/hci_core.h >> +++ b/include/net/bluetooth/hci_core.h >> @@ -627,6 +627,8 @@ int hci_conn_switch_role(struct hci_conn *conn, __u8 role); >> >> void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active); >> >> +void hci_le_conn_failed(struct hci_conn *conn, u8 status); >> + >> /* >> * hci_conn_get() and hci_conn_put() are used to control the life-time of an >> * "hci_conn" object. They do not guarantee that the hci_conn object is running, >> diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c >> index 6797292..4f5029c 100644 >> --- a/net/bluetooth/hci_conn.c >> +++ b/net/bluetooth/hci_conn.c >> @@ -515,7 +515,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) >> EXPORT_SYMBOL(hci_get_route); >> >> /* This function requires the caller holds hdev->lock */ >> -static void le_conn_failed(struct hci_conn *conn, u8 status) >> +void hci_le_conn_failed(struct hci_conn *conn, u8 status) >> { >> struct hci_dev *hdev = conn->hdev; >> >> @@ -545,7 +545,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status) >> if (!conn) >> goto done; >> >> - le_conn_failed(conn, status); >> + hci_le_conn_failed(conn, status); >> >> done: >> hci_dev_unlock(hdev); >> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c >> index d2c6878..df58cde 100644 >> --- a/net/bluetooth/hci_event.c >> +++ b/net/bluetooth/hci_event.c >> @@ -3601,11 +3601,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) >> } >> >> if (ev->status) { >> - mgmt_connect_failed(hdev, &conn->dst, conn->type, >> - conn->dst_type, ev->status); >> - hci_proto_connect_cfm(conn, ev->status); >> - conn->state = BT_CLOSED; >> - hci_conn_del(conn); >> + hci_le_conn_failed(conn, ev->status); >> goto unlock; >> } > > what is the difference between a le_conn_failed and a generic conn_failed. BR/EDR connection failure doesn't have a pretty straightforward flow (e.g see hci_conn_complete_evt) so I'm not 100% sure. It seems to me LE_LINK and ACL_LINK connections might have similar connection failure routine, however SCO_LINK doesn 't. Moreover, in le_conn_failed() we'll always call hci_update_background_scan() in order to keep background scan running (see patch "[RFC v8 06/10] Bluetooth: Introduce LE auto connection infrastructure"). > I am not sure about the naming of this function if we make it non-static. Not that I have a better name at the moment. So we might just go ahead with it. I don't have a better name for this function also so I'll keep this name. We can always rename it later if appropriate. BR, Andre