michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: bluetooth: Enforce the minimum user_data size at Kconfig

Browse source 
Invalid configurations should be detected during configuration instead
of during compilation whenever possible.

This patch replaces a BUILD_ASSERT on CONFIG_NET_BUF_USER_DATA_SIZE
with what is intended to be an equivalent Kconfig restriction.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-06-12 14:07:08 +02:00 • committed by Johan Hedberg
commit f8dc4b6b50
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/common/dummy.c
View file

@ -25,11 +25,6 @@ BUILD_ASSERT(CONFIG_SYSTEM_WORKQUEUE_PRIORITY < 0);
*/ */
BUILD_ASSERT(CONFIG_BT_HCI_TX_PRIO < CONFIG_BT_RX_PRIO); BUILD_ASSERT(CONFIG_BT_HCI_TX_PRIO < CONFIG_BT_RX_PRIO);
/* The Bluetooth subsystem requires network buffers to have at least 4 bytes
* reserved for user data.
*/
BUILD_ASSERT(CONFIG_NET_BUF_USER_DATA_SIZE >= 4);
#if defined(CONFIG_BT_CTLR) #if defined(CONFIG_BT_CTLR)
/* The Bluetooth Controller's priority receive thread priority shall be higher /* The Bluetooth Controller's priority receive thread priority shall be higher
* than the Bluetooth Host's Tx and the Controller's receive thread priority. * than the Bluetooth Host's Tx and the Controller's receive thread priority.

1
subsys/net/Kconfig
View file

@ -20,6 +20,7 @@ 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"
default 4 default 4
range 4 65535 if BT
range 0 65535 range 0 65535
help help
Amount of memory reserved in each network buffer for user data. In Amount of memory reserved in each network buffer for user data. In