diff options
| author | Andre Guedes | 2012-07-27 20:10:12 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-08-06 20:05:51 +0200 |
| commit | 847012c5e04544aef485dfec29c1c07dc90615a4 (patch) | |
| tree | fc29aa74043ad65cbc629dccf8816e18f4749360 /net/bluetooth | |
| parent | Bluetooth: Fix hci_le_conn_complete_evt (diff) | |
| download | kernel-qcow2-linux-847012c5e04544aef485dfec29c1c07dc90615a4.tar.gz kernel-qcow2-linux-847012c5e04544aef485dfec29c1c07dc90615a4.tar.xz kernel-qcow2-linux-847012c5e04544aef485dfec29c1c07dc90615a4.zip | |
Bluetooth: Remove unneeded code
This patch removes some unneeded code from hci_cs_le_create_conn.
If the hci_conn is not found, it means this LE connection attempt
was triggered by a thrid-party tool (e.g. hcitool). We should not
create this new hci_conn in LE Create Connection command status
event since it is already properly handled in LE Connection
Complete event.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 8b13cccd50cd..27064beda10d 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1638,16 +1638,6 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) hci_proto_connect_cfm(conn, status); hci_conn_del(conn); } - } else { - if (!conn) { - conn = hci_conn_add(hdev, LE_LINK, &cp->peer_addr); - if (conn) { - conn->dst_type = cp->peer_addr_type; - conn->out = true; - } else { - BT_ERR("No memory for new connection"); - } - } } hci_dev_unlock(hdev); |