leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Remove unneeded hci_conn_disconnect abstraction

Browse Source 
The abstraction of disconnect operation via hci_conn_disconnect is not
needed and it does not add any readability. Handle the difference of
AMP physical channels and BR/EDR/LE connection in the timeout callback.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-06-27 13:45:09 +02:00
parent a2b1976b8e
commit 40051e4686
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bluetooth/hci_conn.c
View File

@ -271,21 +271,6 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
} }
} }
static void hci_conn_disconnect(struct hci_conn *conn)
{
__u8 reason;
switch (conn->type) {
case AMP_LINK:
hci_amp_disconn(conn);
break;
default:
reason = hci_proto_disconn_ind(conn);
hci_disconnect(conn, reason);
break;
}
}
static void hci_conn_timeout(struct work_struct *work) static void hci_conn_timeout(struct work_struct *work)
{ {
struct hci_conn *conn = container_of(work, struct hci_conn, struct hci_conn *conn = container_of(work, struct hci_conn,
@ -320,7 +305,12 @@ static void hci_conn_timeout(struct work_struct *work)
break; break;
case BT_CONFIG: case BT_CONFIG:
case BT_CONNECTED: case BT_CONNECTED:
hci_conn_disconnect(conn); if (conn->type == AMP_LINK) {
hci_amp_disconn(conn);
} else {
__u8 reason = hci_proto_disconn_ind(conn);
hci_disconnect(conn, reason);
}
break; break;
default: default:
conn->state = BT_CLOSED; conn->state = BT_CLOSED;