michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: buf: Remove redundant user_data_size from buffers

Browse source 
Since the user data size is now stored in the pool there's very little
value in storing it as well per-buffer.

Change-Id: I17a99123b232423c52a2179b4eccd813728d51b1
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-12-14 09:57:49 +02:00
commit d659bb020e
7 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/net/buf.h
View file

@ -399,9 +399,6 @@ struct net_buf {
/** List pointer used for TCP retransmit buffering */
sys_snode_t sent_list;
/** Size of the user data associated with this buffer. */
uint16_t user_data_size;
/** Reference count. */
uint8_t ref;

2
subsys/bluetooth/host/conn.c
View file

@ -876,7 +876,7 @@ int bt_conn_send(struct bt_conn *conn, struct net_buf *buf)
{
BT_DBG("conn handle %u buf len %u", conn->handle, buf->len);
if (buf->user_data_size < BT_BUF_USER_DATA_MIN) {
if (buf->pool->user_data_size < BT_BUF_USER_DATA_MIN) {
BT_ERR("Too small user data size");
net_buf_unref(buf);
return -EINVAL;

2
subsys/bluetooth/host/hci_core.c
View file

@ -3458,7 +3458,7 @@ int bt_recv(struct net_buf *buf)
BT_DBG("buf %p len %u", buf, buf->len);
if (buf->user_data_size < BT_BUF_USER_DATA_MIN) {
if (buf->pool->user_data_size < BT_BUF_USER_DATA_MIN) {
BT_ERR("Too small user data size");
net_buf_unref(buf);
return -EINVAL;

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

@ -1553,9 +1553,9 @@ static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
}
/* Segment if there is no space in the user_data */
if (buf->user_data_size < BT_BUF_USER_DATA_MIN) {
if (buf->pool->user_data_size < BT_BUF_USER_DATA_MIN) {
BT_WARN("Too small buffer user_data_size %u",
buf->user_data_size);
buf->pool->user_data_size);
goto segment;
}

1
subsys/net/buf.c
View file

@ -64,7 +64,6 @@ static inline struct net_buf *pool_get_uninit(struct net_buf_pool *pool,
buf->pool = pool;
buf->size = pool->buf_size;
buf->user_data_size = pool->user_data_size;
return buf;
}

4
subsys/net/ip/net_core.c
View file

@ -586,9 +586,9 @@ static inline enum net_verdict process_data(struct net_buf *buf,
* contains user data. The rest of the fragments should
* be data fragments without user data.
*/
if (!buf->frags || !buf->user_data_size) {
if (!buf->frags || !buf->pool->user_data_size) {
NET_DBG("Corrupted buffer (frags %p, data size %u)",
buf->frags, buf->user_data_size);
buf->frags, buf->pool->user_data_size);
NET_STATS(++net_stats.processing_error);
return NET_DROP;

2
tests/net/buf/src/main.c
View file

@ -238,7 +238,7 @@ static void net_buf_test_4(void)
frag = buf->frags;
assert_equal(frag->user_data_size, 0, "Invalid user data size");
assert_equal(frag->pool->user_data_size, 0, "Invalid user data size");
i = 0;
while (frag) {