Commit 06c053fb authored by Andre Guedes's avatar Andre Guedes Committed by Marcel Holtmann

Bluetooth: Declare le_conn_failed in hci_core.h

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: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b1efcc28
...@@ -653,6 +653,8 @@ int hci_conn_switch_role(struct hci_conn *conn, __u8 role); ...@@ -653,6 +653,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_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_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, * "hci_conn" object. They do not guarantee that the hci_conn object is running,
......
...@@ -515,7 +515,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) ...@@ -515,7 +515,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
EXPORT_SYMBOL(hci_get_route); EXPORT_SYMBOL(hci_get_route);
/* This function requires the caller holds hdev->lock */ /* 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; struct hci_dev *hdev = conn->hdev;
...@@ -545,7 +545,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status) ...@@ -545,7 +545,7 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status)
if (!conn) if (!conn)
goto done; goto done;
le_conn_failed(conn, status); hci_le_conn_failed(conn, status);
done: done:
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
......
...@@ -3658,11 +3658,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -3658,11 +3658,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
} }
if (ev->status) { if (ev->status) {
mgmt_connect_failed(hdev, &conn->dst, conn->type, hci_le_conn_failed(conn, ev->status);
conn->dst_type, ev->status);
hci_proto_connect_cfm(conn, ev->status);
conn->state = BT_CLOSED;
hci_conn_del(conn);
goto unlock; goto unlock;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment