[46/50] [abbrv] incubator-mynewt-core git commit: MYNEWT-354

[cc...@apache.org]

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.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/6f3d956f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/6f3d956f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/6f3d956f

Branch: refs/heads/master
Commit: 6f3d956f863e03f52ef22513c4b8501a58d6843d
Parents: 4751ae0
Author: William San Filippo <wi...@runtime.io>
Authored: Mon Aug 22 15:00:45 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Mon Aug 22 15:05:12 2016 -0700

----------------------------------------------------------------------
 net/nimble/include/nimble/nimble_opt.h | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/6f3d956f/net/nimble/include/nimble/nimble_opt.h
----------------------------------------------------------------------
diff --git a/net/nimble/include/nimble/nimble_opt.h b/net/nimble/include/nimble/nimble_opt.h
index 2fd8228..c82bcb5 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