summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorAndre Guedes <andre.guedes@openbossa.org>2012-07-27 15:10:12 -0300
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-06 15:05:51 -0300
commit847012c5e04544aef485dfec29c1c07dc90615a4 (patch)
treefc29aa74043ad65cbc629dccf8816e18f4749360 /net/bluetooth
parentb9b343d25484bbceaee454ab422daafb1c5eda96 (diff)
downloadop-kernel-dev-847012c5e04544aef485dfec29c1c07dc90615a4.zip
op-kernel-dev-847012c5e04544aef485dfec29c1c07dc90615a4.tar.gz
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.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 8b13ccc..27064be 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);
OpenPOWER on IntegriCloud