michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Use fixed size for net_buf user data

Browse source 
The "sent" tracking doesn't have to be a signed integer. Use a fixed
size so that the consumed size doesn't change between different
architectures. Use a u16_t since bigger sizes are needed and because
this is mapped to an int function return higher up in the stack.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2019-11-26 20:52:41 +02:00 • committed by Johan Hedberg
commit be71e68fcb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/host/l2cap.c
View file

@ -1221,7 +1221,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch, struct net_buf *buf,
}
static int l2cap_chan_le_send_sdu(struct bt_l2cap_le_chan *ch,
struct net_buf **buf, int sent)
struct net_buf **buf, u16_t sent)
{
int ret, total_len;
struct net_buf *frag;
@ -1299,7 +1299,7 @@ static void l2cap_chan_le_send_resume(struct bt_l2cap_le_chan *ch)
/* Resume tx in case there are buffers in the queue */
while ((buf = l2cap_chan_le_get_tx_buf(ch))) {
int sent = *((int *)net_buf_user_data(buf));
u16_t sent = *((u16_t *)net_buf_user_data(buf));
BT_DBG("buf %p sent %u", buf, sent);
@ -1890,7 +1890,7 @@ int bt_l2cap_chan_send(struct bt_l2cap_chan *chan, struct net_buf *buf)
if (err == -EAGAIN) {
/* Queue buffer to be sent later */
net_buf_put(&(BT_L2CAP_LE_CHAN(chan))->tx_queue, buf);
return *((int *)net_buf_user_data(buf));
return *((u16_t *)net_buf_user_data(buf));
}
BT_ERR("failed to send message %d", err);
}