Connection Update improvements
Subsystems (2)
v2 cover Connection Update improvements
These changes should improve application who want to update the connection parameters for both master and slave devices.
Note: Connection Parameters Request Link Layer Control Procedure (>=4.1) is not supported in BlueZ yet. I will work on this on later patches.
Changes from v1:
* Use simpler user-space API
* Added patch #1
Felipe F. Tonello (2):
Bluetooth: L2CAP: Refactor L2CAP_CONN_PARAM_UPDATE_REQ into a function
Bluetooth: L2CAP: Add BT_LE_CONN_CONFIG socket option
include/net/bluetooth/bluetooth.h | 9 ++++ include/net/bluetooth/hci_core.h | 1 + include/net/bluetooth/l2cap.h | 3 ++ net/bluetooth/hci_core.c | 1 + net/bluetooth/l2cap_core.c | 36 ++++++++----- net/bluetooth/l2cap_sock.c | 108 ++++++++++++++++++++++++++++++++++++++ net/bluetooth/mgmt.c | 1 + 7 files changed, 146 insertions(+), 13 deletions(-)
Signature · 1 line
2.11.1
RFC PATCH v2 1/2 Bluetooth: L2CAP: Refactor L2CAP_CONN_PARAM_UPDATE_REQ into a function
This signaling command is useful for any connection parameter change procedure, thus it is important to allow access to it from outside this translation unit.
--- include/net/bluetooth/l2cap.h | 3 +++ net/bluetooth/l2cap_core.c | 36 +++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-)
include/net/bluetooth/l2cap.h +3 -0
@@ -948,4 +948,7 @@ void l2cap_conn_put(struct l2cap_conn *conn);int l2cap_register_user (struct l2cap_conn *conn,struct l2cap_user *user);void l2cap_unregister_user (struct l2cap_conn *conn,struct l2cap_user *user); +void l2cap_le_conn_req (struct l2cap_conn *conn,u8 min_interval, +u8 max_interval,u8 latency,u8 supv_timeout); +#endif /* __L2CAP_H */
net/bluetooth/l2cap_core.c +23 -13
@@ -1483,6 +1483,24 @@ static void l2cap_conn_start(struct l2cap_conn *conn)mutex_unlock (&conn->chan_lock); } +void l2cap_le_conn_req (struct l2cap_conn *conn,u8 min_interval, +u8 max_interval,u8 latency,u8 supv_timeout) +{ +struct l2cap_conn_param_update_req req; + +if (conn->hcon->role !=HCI_ROLE_SLAVE ) +return ; + + req.min =cpu_to_le16 (min_interval); + req.max =cpu_to_le16 (max_interval); + req.latency =cpu_to_le16 (latency); + req.to_multiplier =cpu_to_le16 (supv_timeout); + +l2cap_send_cmd (conn,l2cap_get_ident (conn), +L2CAP_CONN_PARAM_UPDATE_REQ ,sizeof (req), &req); +} + +static void l2cap_le_conn_ready (struct l2cap_conn *conn) {struct hci_conn *hcon = conn->hcon;
@@ -1501,19 +1519,11 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn)* been configured for this connection. If not, then trigger * the connection update procedure. */ -if (hcon->role ==HCI_ROLE_SLAVE && - (hcon->le_conn_interval < hcon->le_conn_min_interval || - hcon->le_conn_interval > hcon->le_conn_max_interval)) { -struct l2cap_conn_param_update_req req; - - req.min =cpu_to_le16 (hcon->le_conn_min_interval); - req.max =cpu_to_le16 (hcon->le_conn_max_interval); - req.latency =cpu_to_le16 (hcon->le_conn_latency); - req.to_multiplier =cpu_to_le16 (hcon->le_supv_timeout); - -l2cap_send_cmd (conn,l2cap_get_ident (conn), -L2CAP_CONN_PARAM_UPDATE_REQ ,sizeof (req), &req); - } +if (hcon->le_conn_interval < hcon->le_conn_min_interval || + hcon->le_conn_interval > hcon->le_conn_max_interval) +l2cap_le_conn_req (conn, hcon->le_conn_min_interval, + hcon->le_conn_max_interval, hcon->le_conn_latency, + hcon->le_supv_timeout); }static void l2cap_conn_ready (struct l2cap_conn *conn)
Signature · 1 line
2.11.1
RFC PATCH v2 2/2 Bluetooth: L2CAP: Add BT_LE_CONN_CONFIG socket option
In reply to Felipe F. TonelloThere is a need for certain LE profiles (MIDI for example)to change the current connection's parameters. In order to do that, this patch introduces a new BT_LE_CONN_CONFIG socket option for SOL_BLUETOOTH protocol which allow user-space l2cap sockets to update the current connection.
The current options exported to user-space are default, low and high latency. Internally, when a custom latency is used when the connection parameters are set by MGMT_OP_LOAD_CONN_PARAM.
If ROLE is SLAVE, then it will also send a L2CAP_CONN_PARAM_UPDATE_REQ signaling command to the MASTER, triggering proper 4.0 parameter update procedure.
This option will also send a MGMT_EV_NEW_CONN_PARAM event with the store_hint set so the user-space application can store the connection parameters for persistence reasons.
Note: Connection Parameters Request Link Layer Control Procedure is not supported by BlueZ yet.
--- include/net/bluetooth/bluetooth.h | 9 ++++ include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 1 + net/bluetooth/l2cap_sock.c | 109 ++++++++++++++++++++++++++++++++++++++ net/bluetooth/mgmt.c | 1 + 5 files changed, 121 insertions(+)
include/net/bluetooth/bluetooth.h +9 -0
@@ -122,6 +122,15 @@ struct bt_voice {#define BT_SNDMTU 12#define BT_RCVMTU 13 +#define BT_LE_CONN_CONFIG 14 +enum bt_le_conn_config { +BT_LE_CONN_CONFIG_DEFAULT_LATENCY =0 , +BT_LE_CONN_CONFIG_LOW_LATENCY , +BT_LE_CONN_CONFIG_HIGH_LATENCY , +/* Kernel-only configuration */ +BT_LE_CONN_CONFIG_CUSTOM_LATENCY =100 , +}; + __printf(1, 2)void bt_info (const char *fmt, ...);__printf (1 ,2 )
include/net/bluetooth/hci_core.h +1 -0
@@ -522,6 +522,7 @@ struct hci_conn_params {u16 conn_max_interval;u16 conn_latency;u16 supervision_timeout; +enum bt_le_conn_config conn_config;enum {HCI_AUTO_CONN_DISABLED ,
net/bluetooth/hci_core.c +1 -0
@@ -2824,6 +2824,7 @@ struct hci_conn_params *hci_conn_params_add(struct hci_dev *hdev, params->conn_latency = hdev->le_conn_latency; params->supervision_timeout = hdev->le_supv_timeout; params->auto_connect =HCI_AUTO_CONN_DISABLED ; + params->conn_config =BT_LE_CONN_CONFIG_DEFAULT_LATENCY ;BT_DBG ("addr %pMR (type %u)" , addr, addr_type);
net/bluetooth/l2cap_sock.c +109 -0
121 lines not on this page · raw message
net/bluetooth/mgmt.c +1 -0
@@ -5540,6 +5540,7 @@ static int load_conn_param(struct sock *sk, struct hci_dev *hdev, void *data, hci_param->conn_max_interval = max; hci_param->conn_latency = latency; hci_param->supervision_timeout = timeout; + hci_param->conn_config =BT_LE_CONN_CONFIG_CUSTOM_LATENCY ; }hci_dev_unlock (hdev);
Signature · 1 line
2.11.1
Hi,
Any comments?
Quoted 23 lines · Felipe F. Tonello
These changes should improve application who want to update the connection parameters for both master and slave devices.
Note: Connection Parameters Request Link Layer Control Procedure (>=4.1) is not supported in BlueZ yet. I will work on this on later patches.
Changes from v1:
* Use simpler user-space API
* Added patch #1Felipe F. Tonello (2):
Bluetooth: L2CAP: RefactorL2CAP_CONN_PARAM_UPDATE_REQinto a function
Bluetooth: L2CAP: AddBT_LE_CONN_CONFIGsocket optioninclude/net/bluetooth/bluetooth.h | 9 ++++ include/net/bluetooth/hci_core.h | 1 + include/net/bluetooth/l2cap.h | 3 ++ net/bluetooth/hci_core.c | 1 + net/bluetooth/l2cap_core.c | 36 ++++++++----- net/bluetooth/l2cap_sock.c | 108 ++++++++++++++++++++++++++++++++++++++ net/bluetooth/mgmt.c | 1 + 7 files changed, 146 insertions(+), 13 deletions(-)
Signature · 1 line
Felipe