Bluetooth: Use continuous scanning when creating LE connections
Subsystems (2)
PATCH v2 1/2 Bluetooth: Use continuous scanning when creating LE connections
From: Johan Hedberg <[email protected]>
All LE connections are now triggered through a preceding passive scan and waiting for a connectable advertising report. This means we've got the best possible guarantee that the device is within range and should be able to request the controller to perform continuous scanning. This way we minimize the risk that we miss out on any advertising packets.
--- net/bluetooth/hci_conn.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/bluetooth/hci_conn.c +5 -1
@@ -726,8 +726,12 @@ static void hci_req_add_le_create_conn(struct hci_request *req,if (hci_update_random_address (req, false, &own_addr_type))return ; +/* Set window to be the same value as the interval to enable +* continuous scanning. +*/ cp.scan_interval =cpu_to_le16 (hdev->le_scan_interval); - cp.scan_window =cpu_to_le16 (hdev->le_scan_window); + cp.scan_window = cp.scan_interval; +bacpy (&cp.peer_addr, &conn->dst); cp.peer_addr_type = conn->dst_type; cp.own_address_type = own_addr_type;
Signature · 1 line
2.5.0
PATCH v2 2/2 Bluetooth: Don't treat connection timeout as a failure
From: Johan Hedberg <[email protected]>
When we're doing background scanning and connection attempts it's possible we timeout trying to connect and go back to scanning again. The timeout triggers a HCI_LE_Create_Connection_Cancel which will trigger a Connection Complete with "Unknown Connection Identifier" error status. Since we go back to scanning this isn't really a failure and shouldn't be presented as such to user space through mgmt.
The exception to this is if the connection attempt was due to an explicit request on an L2CAP socket (indicated by params->explicit_connect being true). Since the socket will get an error it's consistent to also notify the failure on mgmt in this case.
--- net/bluetooth/hci_conn.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/bluetooth/hci_conn.c +10 -2
@@ -668,8 +668,16 @@ void hci_le_conn_failed(struct hci_conn *conn, u8 status) conn->state =BT_CLOSED ; -mgmt_connect_failed (hdev, &conn->dst, conn->type, conn->dst_type, - status); +/* If the status indicates successful cancellation of +* the attempt (i.e. Unkown Connection Id) there's no point of +* notifying failure since we'll go back to keep trying to +* connect. The only exception is explicit connect requests +* where a timeout + cancel does indicate an actual failure. +*/ +if (status !=HCI_ERROR_UNKNOWN_CONN_ID || + (params && params->explicit_connect)) +mgmt_connect_failed (hdev, &conn->dst, conn->type, + conn->dst_type, status);hci_connect_cfm (conn, status);
Signature · 1 line
2.5.0
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: Don't treat connection timeout as a failure
Hi Johan,
Quoted 12 lines
When we're doing background scanning and connection attempts it's possible we timeout trying to connect and go back to scanning again. The timeout triggers a
HCI_LE_Create_Connection_Cancelwhich will trigger a Connection Complete with "Unknown Connection Identifier" error status. Since we go back to scanning this isn't really a failure and shouldn't be presented as such to user space through mgmt.The exception to this is if the connection attempt was due to an explicit request on an L2CAP socket (indicated by
params->explicit_connectbeing true). Since the socket will get an error it's consistent to also notify the failure on mgmt in this case.
Quoted 4 lines
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/hci_conn.c| 12 ++++++++++--1 file changed, 10 insertions(+), 2 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Marcel Holtmann
maintainerHi Johan,
Quoted 11 lines
All LE connections are now triggered through a preceding passive scan and waiting for a connectable advertising report. This means we've got the best possible guarantee that the device is within range and should be able to request the controller to perform continuous scanning. This way we minimize the risk that we miss out on any advertising packets.
Signed-off-by Johan Hedberg <[email protected]>Cc [email protected] # 4.3+---
net/bluetooth/hci_conn.c| 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel