aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-02-18 07:53:58 -0500
committerMarcel Holtmann <marcel@holtmann.org>2015-02-19 02:44:29 -0500
commit3a6d576be9fe02b0c3ffa89ef6eac048e14eec84 (patch)
tree70bcc5b6861fe48521d9aab181c8d7e0db15c5de /net/bluetooth/hci_event.c
parent539c496d88f7f96d42abde4e9d901c8f8167d615 (diff)
Bluetooth: Convert disconn_cfm to be triggered through hci_cb
This patch moves all the disconn_cfm callbacks to be based on the hci_cb list. This means making l2cap_disconn_cfm private to l2cap_core.c and sco_conn_cb private to sco.c respectively. Since the hci_conn type filtering isn't done any more on the wrapper level the callbacks themselves need to check that they were passed a relevant type of connection. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 0b599129c64c..e9b17b585ee8 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2444,7 +2444,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2444 2444
2445 type = conn->type; 2445 type = conn->type;
2446 2446
2447 hci_proto_disconn_cfm(conn, ev->reason); 2447 hci_disconn_cfm(conn, ev->reason);
2448 hci_conn_del(conn); 2448 hci_conn_del(conn);
2449 2449
2450 /* Re-enable advertising if necessary, since it might 2450 /* Re-enable advertising if necessary, since it might