michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Avoid warning with privacy disabled

Browse source 
To avoid warnings (seen on some machines) that a function reaches its
end without returning a value, conditionally compile the function in a
way that this cannot happen.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-07-14 15:19:12 +02:00 • committed by Johan Hedberg
commit 77b0108afd
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/controller/ll_sw/ll_filter.c
View file

@ -247,13 +247,14 @@ bool ctrl_irk_whitelisted(u8_t rl_idx)
struct ll_filter *ctrl_filter_get(bool whitelist) struct ll_filter *ctrl_filter_get(bool whitelist)
{ {
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY)
if (whitelist) { if (whitelist) {
return &wl_filter; return &wl_filter;
} }
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY)
return &rl_filter; return &rl_filter;
#else #else
LL_ASSERT(0); LL_ASSERT(whitelist);
return &wl_filter;
#endif #endif
} }