From: Andre Guedes <andre.guedes@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 4/7] Bluetooth: Remove hci_cs_le_create_conn event handler
Date: Tue, 1 Oct 2013 20:03:53 -0300 [thread overview]
Message-ID: <1380668636-30654-5-git-send-email-andre.guedes@openbossa.org> (raw)
In-Reply-To: <1380668636-30654-1-git-send-email-andre.guedes@openbossa.org>
This patch removes the hci_cs_le_create_conn event handler since this
handling is now done in create_le_connection_complete() callback in
hci_conn.c.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
---
net/bluetooth/hci_event.c | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index d171c04b..1d1ffa6 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1465,33 +1465,6 @@ static void hci_cs_disconnect(struct hci_dev *hdev, u8 status)
hci_dev_unlock(hdev);
}
-static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
-{
- struct hci_conn *conn;
-
- BT_DBG("%s status 0x%2.2x", hdev->name, status);
-
- if (status) {
- hci_dev_lock(hdev);
-
- conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);
- if (!conn) {
- hci_dev_unlock(hdev);
- return;
- }
-
- BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &conn->dst, conn);
-
- conn->state = BT_CLOSED;
- mgmt_connect_failed(hdev, &conn->dst, conn->type,
- conn->dst_type, status);
- hci_proto_connect_cfm(conn, status);
- hci_conn_del(conn);
-
- hci_dev_unlock(hdev);
- }
-}
-
static void hci_cs_create_phylink(struct hci_dev *hdev, u8 status)
{
struct hci_cp_create_phy_link *cp;
@@ -2342,10 +2315,6 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
hci_cs_disconnect(hdev, ev->status);
break;
- case HCI_OP_LE_CREATE_CONN:
- hci_cs_le_create_conn(hdev, ev->status);
- break;
-
case HCI_OP_CREATE_PHY_LINK:
hci_cs_create_phylink(hdev, ev->status);
break;
--
1.8.4
next prev parent reply other threads:[~2013-10-01 23:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 23:03 [PATCH 0/7] LE connection refactoring and fixes Andre Guedes
2013-10-01 23:03 ` [PATCH 1/7] Bluetooth: Initialize hci_conn fields in hci_connect_le Andre Guedes
2013-10-02 4:57 ` Marcel Holtmann
2013-10-03 14:03 ` Andre Guedes
2013-10-01 23:03 ` [PATCH 2/7] Bluetooth: Use HCI request for LE connection Andre Guedes
2013-10-02 5:04 ` Marcel Holtmann
2013-10-03 14:03 ` Andre Guedes
2013-10-01 23:03 ` [PATCH 3/7] Bluetooth: Remove hci_le_create_connection Andre Guedes
2013-10-02 5:08 ` Marcel Holtmann
2013-10-03 14:03 ` Andre Guedes
2013-10-01 23:03 ` Andre Guedes [this message]
2013-10-01 23:44 ` [PATCH 4/7] Bluetooth: Remove hci_cs_le_create_conn event handler Anderson Lizardo
2013-10-02 5:11 ` Marcel Holtmann
2013-10-03 14:04 ` Andre Guedes
2013-10-03 14:13 ` Marcel Holtmann
2013-10-01 23:03 ` [PATCH 5/7] Bluetooth: Refactor hci_connect_le Andre Guedes
2013-10-02 0:05 ` Anderson Lizardo
2013-10-03 14:04 ` Andre Guedes
2013-10-01 23:03 ` [PATCH 6/7] Bluetooth: Refactor LE Connection Complete HCI event handler Andre Guedes
2013-10-02 5:21 ` Marcel Holtmann
2013-10-03 14:06 ` Andre Guedes
2013-10-03 14:15 ` Marcel Holtmann
2013-10-03 18:22 ` Andre Guedes
2013-10-01 23:03 ` [PATCH 7/7] Bluetooth: Locking in hci_le_conn_complete_evt Andre Guedes
2013-10-02 5:23 ` Marcel Holtmann
2013-10-03 14:06 ` 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=1380668636-30654-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox