michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Kconfig: net: deprecate NET_BUF_USER_DATA_LEN

Browse source 
As user data sizes are now set on a per pool basis, this Kconfig option
has no purpose.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-11-21 12:30:47 +10:00 • committed by Johan Hedberg
commit 8e99db5801
10 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/net/buf.h
View file

@ -15,10 +15,6 @@
#include <sys/util.h> #include <sys/util.h>
#include <zephyr.h> #include <zephyr.h>
#ifndef CONFIG_NET_BUF_USER_DATA_SIZE
#define CONFIG_NET_BUF_USER_DATA_SIZE 0
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -1216,7 +1212,6 @@ extern const struct net_buf_data_cb net_buf_var_cb;
* @param _destroy Optional destroy callback when buffer is freed. * @param _destroy Optional destroy callback when buffer is freed.
*/ */
#define NET_BUF_POOL_DEFINE(_name, _count, _size, _ud_size, _destroy) \ #define NET_BUF_POOL_DEFINE(_name, _count, _size, _ud_size, _destroy) \
BUILD_ASSERT(_ud_size <= CONFIG_NET_BUF_USER_DATA_SIZE); \
NET_BUF_POOL_FIXED_DEFINE(_name, _count, _size, _ud_size, _destroy) NET_BUF_POOL_FIXED_DEFINE(_name, _count, _size, _ud_size, _destroy)
/** /**

2
include/net/net_pkt.h
View file

@ -1248,7 +1248,7 @@ static inline bool net_pkt_is_being_overwritten(struct net_pkt *pkt)
*/ */
#define NET_PKT_DATA_POOL_DEFINE(name, count) \ #define NET_PKT_DATA_POOL_DEFINE(name, count) \
NET_BUF_POOL_DEFINE(name, count, CONFIG_NET_BUF_DATA_SIZE, \ NET_BUF_POOL_DEFINE(name, count, CONFIG_NET_BUF_DATA_SIZE, \
CONFIG_NET_BUF_USER_DATA_SIZE, NULL) 0, NULL)
/** @cond INTERNAL_HIDDEN */ /** @cond INTERNAL_HIDDEN */

1
samples/net/sockets/can/prj.conf
View file

@ -34,4 +34,3 @@ CONFIG_CAN_LOG_LEVEL_DBG=y
# Use smaller buffers for net_buf as CANBUS packets are quite small. # Use smaller buffers for net_buf as CANBUS packets are quite small.
CONFIG_NET_BUF_DATA_SIZE=64 CONFIG_NET_BUF_DATA_SIZE=64
CONFIG_NET_BUF_USER_DATA_SIZE=0

1
samples/subsys/mgmt/mcumgr/smp_svr/overlay-udp.conf
View file

@ -11,7 +11,6 @@ CONFIG_NET_IPV6=y
CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS=y
CONFIG_NET_SOCKETS_POSIX_NAMES=y CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_NET_CONNECTION_MANAGER=y CONFIG_NET_CONNECTION_MANAGER=y
CONFIG_NET_BUF_USER_DATA_SIZE=24
CONFIG_NET_CONFIG_SETTINGS=y CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.1" CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.168.1.1"
CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"

1
samples/subsys/usb/audio/headphones_microphone/prj.conf
View file

@ -11,7 +11,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
#net buf options #net buf options
CONFIG_NET_BUF=y CONFIG_NET_BUF=y
CONFIG_NET_BUF_USER_DATA_SIZE=0
#USB audio related configs #USB audio related configs
CONFIG_USB_DEVICE_AUDIO=y CONFIG_USB_DEVICE_AUDIO=y

1
samples/subsys/usb/audio/headset/prj.conf
View file

@ -11,7 +11,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
#net buf options #net buf options
CONFIG_NET_BUF=y CONFIG_NET_BUF=y
CONFIG_NET_BUF_USER_DATA_SIZE=0
#USB audio related configs #USB audio related configs
CONFIG_USB_DEVICE_AUDIO=y CONFIG_USB_DEVICE_AUDIO=y

3
subsys/mgmt/mcumgr/Kconfig
View file

@ -459,7 +459,4 @@ config MCUMGR_BUF_USER_DATA_SIZE
Different mcumgr transports impose different requirements for this Different mcumgr transports impose different requirements for this
setting. A value of 4 is sufficient for UART, shell, and bluetooth. setting. A value of 4 is sufficient for UART, shell, and bluetooth.
For UDP, the userdata must be large enough to hold a IPv4/IPv6 address. For UDP, the userdata must be large enough to hold a IPv4/IPv6 address.
Note that CONFIG_NET_BUF_USER_DATA_SIZE must be at least as big as
MCUMGR_BUF_USER_DATA_SIZE.
endif # MCUMGR endif # MCUMGR

10
subsys/net/Kconfig
View file

@ -14,14 +14,10 @@ config NET_BUF
if NET_BUF if NET_BUF
config NET_BUF_USER_DATA_SIZE config NET_BUF_USER_DATA_SIZE
int "Size of user_data available in every network buffer" int "Size of user_data available in every network buffer (DEPRECATED)"
default 8 if ((BT || NET_TCP) && 64BIT) || BT_ISO default 0
default 4
range 4 65535 if BT || NET_TCP
range 0 65535
help help
Amount of memory reserved in each network buffer for user data. In User data size is now set on a per-pool basis at declaration point
most cases this can be left as the default value.
config NET_BUF_LOG config NET_BUF_LOG
bool "Network buffer logging" bool "Network buffer logging"

1
tests/bluetooth/controller/mock_ctrl/include/kconfig.h
View file

@ -147,7 +147,6 @@
#define CONFIG_BT_LOG_LEVEL 1 #define CONFIG_BT_LOG_LEVEL 1
#define CONFIG_BT_CTLR_COMPANY_ID 0x1234 #define CONFIG_BT_CTLR_COMPANY_ID 0x1234
#define CONFIG_BT_CTLR_SUBVERSION_NUMBER 0x5678 #define CONFIG_BT_CTLR_SUBVERSION_NUMBER 0x5678
#define CONFIG_NET_BUF_USER_DATA_SIZE 4096
#define CONFIG_BT_CTLR_ASSERT_HANDLER y #define CONFIG_BT_CTLR_ASSERT_HANDLER y
#define CONFIG_BT_BUF_ACL_TX_COUNT 7 #define CONFIG_BT_BUF_ACL_TX_COUNT 7
#define CONFIG_BT_BUF_ACL_TX_SIZE 27 #define CONFIG_BT_BUF_ACL_TX_SIZE 27

1
tests/net/all/prj.conf
View file

@ -32,7 +32,6 @@ CONFIG_NET_PKT_TX_COUNT=10
CONFIG_NET_BUF_RX_COUNT=15 CONFIG_NET_BUF_RX_COUNT=15
CONFIG_NET_BUF_TX_COUNT=15 CONFIG_NET_BUF_TX_COUNT=15
CONFIG_NET_BUF_DATA_SIZE=96 CONFIG_NET_BUF_DATA_SIZE=96
CONFIG_NET_BUF_USER_DATA_SIZE=10
CONFIG_NET_DEBUG_NET_PKT_ALLOC=y CONFIG_NET_DEBUG_NET_PKT_ALLOC=y
CONFIG_NET_DEBUG_NET_PKT_NON_FRAGILE_ACCESS=y CONFIG_NET_DEBUG_NET_PKT_NON_FRAGILE_ACCESS=y
CONFIG_NET_PKT_TIMESTAMP=y CONFIG_NET_PKT_TIMESTAMP=y