You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2017/03/22 17:19:38 UTC
incubator-mynewt-core git commit: MYNEWT-633: Controller does not
respond on LL_PHY_REQ
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop f5b3bf684 -> ded20e114
MYNEWT-633: Controller does not respond on LL_PHY_REQ
Fix uninitialized local variable.
This closes #211.
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/ded20e11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ded20e11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ded20e11
Branch: refs/heads/develop
Commit: ded20e11444d67e6b040a50ab2623002cd513727
Parents: f5b3bf6
Author: William San Filippo <wi...@runtime.io>
Authored: Wed Mar 22 10:17:30 2017 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Wed Mar 22 10:17:30 2017 -0700
----------------------------------------------------------------------
net/nimble/controller/src/ble_ll_ctrl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ded20e11/net/nimble/controller/src/ble_ll_ctrl.c
----------------------------------------------------------------------
diff --git a/net/nimble/controller/src/ble_ll_ctrl.c b/net/nimble/controller/src/ble_ll_ctrl.c
index f933922..55f58e8 100644
--- a/net/nimble/controller/src/ble_ll_ctrl.c
+++ b/net/nimble/controller/src/ble_ll_ctrl.c
@@ -1559,6 +1559,10 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
ble_ll_log(BLE_LL_LOG_ID_LL_CTRL_RX, opcode, len, 0);
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
+ restart_encryption = 0;
+#endif
+
/* If opcode comes from reserved value or CtrlData fields is invalid
* we shall respond with LL_UNKNOWN_RSP
*/
@@ -1569,10 +1573,6 @@ ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
goto ll_ctrl_send_rsp;
}
-#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
- restart_encryption = 0;
-#endif
-
/* Check if the feature is supported. */
switch (opcode) {
case BLE_LL_CTRL_LENGTH_REQ: