From: Andre Guedes <andre.guedes@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Subject: [RFC v8 02/10] Bluetooth: Declare le_conn_failed in hci_core.h
Date: Wed, 5 Feb 2014 19:23:18 -0300 [thread overview]
Message-ID: <1391639006-26311-2-git-send-email-andre.guedes@openbossa.org> (raw)
In-Reply-To: <1391639006-26311-1-git-send-email-andre.guedes@openbossa.org>
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 <andre.guedes@openbossa.org>
---
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;
}
--
1.8.5.3
next prev parent reply other threads:[~2014-02-05 22:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 22:23 [RFC v8 01/10] Bluetooth: Create hci_stop_le_scan_req() helper Andre Guedes
2014-02-05 22:23 ` Andre Guedes [this message]
2014-02-14 22:26 ` [RFC v8 02/10] Bluetooth: Declare le_conn_failed in hci_core.h Marcel Holtmann
2014-02-17 20:24 ` Andre Guedes
2014-02-05 22:23 ` [RFC v8 03/10] Bluetooth: Stop scanning on LE connection Andre Guedes
2014-02-05 22:23 ` [RFC v8 04/10] Bluetooth: Remove unused function Andre Guedes
2014-02-14 22:28 ` Marcel Holtmann
2014-02-17 20:24 ` Andre Guedes
2014-02-05 22:23 ` [RFC v8 05/10] Bluetooth: Introduce hdev->pend_le_conn list Andre Guedes
2014-02-05 22:23 ` [RFC v8 06/10] Bluetooth: Introduce LE auto connection infrastructure Andre Guedes
2014-02-06 16:02 ` Vinicius Costa Gomes
2014-02-06 17:34 ` Andre Guedes
2014-02-06 17:35 ` Andre Guedes
2014-02-05 22:23 ` [RFC v8 07/10] Bluetooth: Temporarily stop background scanning on discovery Andre Guedes
2014-02-05 22:23 ` [RFC v8 08/10] Bluetooth: Introduce LE auto connect options Andre Guedes
2014-02-05 22:23 ` [RFC v8 09/10] Bluetooth: Auto connection and power on Andre Guedes
2014-02-05 22:23 ` [RFC v8 10/10] Bluetooth: Add le_auto_conn file on debugfs Andre Guedes
2014-02-14 22:21 ` [RFC v8 01/10] Bluetooth: Create hci_stop_le_scan_req() helper Marcel Holtmann
2014-02-17 20:23 ` Andre Guedes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391639006-26311-2-git-send-email-andre.guedes@openbossa.org \
--to=andre.guedes@openbossa.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.