michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Make create_frag() responsible for copying data

Browse source 
We can simplify & shorten the code by doing the copying from the
original buffer straight in the create_frag() function.

Change-Id: I8e7676642a13095783071275fbccc248f55e245c
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-11-06 09:27:39 +02:00 • committed by Anas Nashif
commit 6d1864c55d
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
net/bluetooth/conn.c
View file

@ -373,20 +373,23 @@ fail:
return false; return false;
} }
static struct net_buf *create_frag(struct bt_conn *conn) static struct net_buf *create_frag(struct bt_conn *conn, struct net_buf *buf)
{ {
struct net_buf *buf; struct net_buf *frag;
buf = bt_l2cap_create_pdu(&frag_buf); frag = bt_l2cap_create_pdu(&frag_buf);
if (conn->state != BT_CONN_CONNECTED) { if (conn->state != BT_CONN_CONNECTED) {
if (buf) { if (frag) {
net_buf_unref(buf); net_buf_unref(frag);
} }
return NULL; return NULL;
} }
return buf; memcpy(net_buf_add(frag, bt_dev.le.mtu), buf->data, bt_dev.le.mtu);
net_buf_pull(buf, bt_dev.le.mtu);
return frag;
} }
static bool send_buf(struct bt_conn *conn, struct net_buf *buf) static bool send_buf(struct bt_conn *conn, struct net_buf *buf)
@ -401,13 +404,11 @@ static bool send_buf(struct bt_conn *conn, struct net_buf *buf)
} }
/* Create & enqueue first fragment */ /* Create & enqueue first fragment */
frag = create_frag(conn); frag = create_frag(conn, buf);
if (!frag) { if (!frag) {
return false; return false;
} }
memcpy(net_buf_add(frag, bt_dev.le.mtu), buf->data, bt_dev.le.mtu);
net_buf_pull(buf, bt_dev.le.mtu);
if (!send_frag(conn, frag, BT_ACL_START_NO_FLUSH, true)) { if (!send_frag(conn, frag, BT_ACL_START_NO_FLUSH, true)) {
return false; return false;
} }
@ -417,16 +418,11 @@ static bool send_buf(struct bt_conn *conn, struct net_buf *buf)
* buffer (which works since we've used net_buf_pull on it. * buffer (which works since we've used net_buf_pull on it.
*/ */
while (buf->len > bt_dev.le.mtu) { while (buf->len > bt_dev.le.mtu) {
frag = create_frag(conn); frag = create_frag(conn, buf);
if (!frag) { if (!frag) {
return false; return false;
} }
/* Copy from original buffer */
memcpy(net_buf_add(frag, bt_dev.le.mtu), buf->data,
bt_dev.le.mtu);
net_buf_pull(buf, bt_dev.le.mtu);
if (!send_frag(conn, frag, BT_ACL_CONT, true)) { if (!send_frag(conn, frag, BT_ACL_CONT, true)) {
return false; return false;
} }