diff options
author | William San Filippo <wills@runtime.io> | 2016-08-22 15:00:45 -0700 |
---|---|---|
committer | William San Filippo <wills@runtime.io> | 2016-08-22 15:05:12 -0700 |
commit | 6f3d956f863e03f52ef22513c4b8501a58d6843d (patch) | |
tree | f44c7b73833c20e8fc20189cbf98aed60a9e726e | |
parent | 4751ae0d8f5aefa2a2ae9e8d41652c08a7538ca0 (diff) |
MYNEWT-354
This fixes the compilation error when BLE_LL_CFG_FEAT_LE_ENCRYPTION
was set to 0. The issue here was that BLE_LL_CFG_FEAT_LE_PING cannot
be set to 1 if encryption is not defined (set to 0). Note that
LE_PING can be either defined or undefined (1 or 0) if encryption
is defined.
-rw-r--r-- | net/nimble/include/nimble/nimble_opt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/nimble/include/nimble/nimble_opt.h b/net/nimble/include/nimble/nimble_opt.h index 2fd82285..c82bcb5a 100644 --- a/net/nimble/include/nimble/nimble_opt.h +++ b/net/nimble/include/nimble/nimble_opt.h @@ -357,9 +357,14 @@ /* * This option allows a controller to send/receive LE pings. */ +#if (BLE_LL_CFG_FEAT_LE_ENCRYPTION == 0) +#undef BLE_LL_CFG_FEAT_LE_PING +#define BLE_LL_CFG_FEAT_LE_PING (0) +#else #ifndef BLE_LL_CFG_FEAT_LE_PING #define BLE_LL_CFG_FEAT_LE_PING (1) #endif +#endif /* * This option enables/disables the data length update procedure in the |