michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Make bt_l2cap_update_conn_param to be non-void function

Browse source 
Makes bt_l2cap_update_conn_param to return an error if command was not
sent.

Change-Id: Ie7351040bd371bb161afc2f2a2c10e015bcdc8e4
Signed-off-by: Mariusz Skamra <mariusz.skamra@tieto.com>
This commit is contained in:
Mariusz Skamra 2015-08-23 20:17:11 +02:00 • committed by Anas Nashif
commit 7682d1579f
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/bluetooth/l2cap.c
View file

@ -316,7 +316,7 @@ void bt_l2cap_recv(struct bt_conn *conn, struct bt_buf *buf)
chan->recv(conn, buf);
}
void bt_l2cap_update_conn_param(struct bt_conn *conn)
int bt_l2cap_update_conn_param(struct bt_conn *conn)
{
struct bt_l2cap_sig_hdr *hdr;
struct bt_l2cap_conn_param_req *req;
@ -325,12 +325,12 @@ void bt_l2cap_update_conn_param(struct bt_conn *conn)
/* Check if we need to update anything */
if (conn->le_conn_interval >= LE_CONN_MIN_INTERVAL &&
conn->le_conn_interval <= LE_CONN_MAX_INTERVAL) {
return;
return -EALREADY;
}
buf = bt_l2cap_create_pdu(conn);
if (!buf) {
return;
return -ENOBUFS;
}
hdr = bt_buf_add(buf, sizeof(*hdr));
@ -345,6 +345,8 @@ void bt_l2cap_update_conn_param(struct bt_conn *conn)
req->timeout = sys_cpu_to_le16(LE_CONN_TIMEOUT);
bt_l2cap_send(conn, BT_L2CAP_CID_LE_SIG, buf);
return 0;
}
int bt_l2cap_init(void)

2
net/bluetooth/l2cap.h
View file

@ -103,7 +103,7 @@ void bt_l2cap_send(struct bt_conn *conn, uint16_t cid, struct bt_buf *buf);
void bt_l2cap_recv(struct bt_conn *conn, struct bt_buf *buf);
/* Perform connection parameter update request */
void bt_l2cap_update_conn_param(struct bt_conn *conn);
int bt_l2cap_update_conn_param(struct bt_conn *conn);
/* Initialize L2CAP and supported channels */
int bt_l2cap_init(void);