You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by "janc.apache.org via commits" <co...@mynewt.apache.org> on 2026/10/31 22:10:42 UTC
(mynewt-nimble) 01/07: nimble/ll: Remove le_ping_supp flag
This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 2210b2d37e1f0fbea8b9de426a5c9425539efb6d
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Fri Oct 9 01:35:16 2026 +0200
nimble/ll: Remove le_ping_supp flag
This flag was set for every connection if LE Ping was enabled and never
cleared, so it only mirrored BLE_LL_CFG_FEAT_LE_PING setting. Use
explicit syscfg check instead, as already done for central role, and
remove empty stub for ble_ll_conn_auth_pyld_timer_start() as it is no
longer used when LE Ping is disabled.
Assisted-by: Claude:claude-opus-5-5
---
nimble/controller/include/controller/ble_ll_conn.h | 1 -
nimble/controller/src/ble_ll_conn.c | 4 +---
nimble/controller/src/ble_ll_conn_priv.h | 2 --
nimble/controller/src/ble_ll_ctrl.c | 6 +++---
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/nimble/controller/include/controller/ble_ll_conn.h b/nimble/controller/include/controller/ble_ll_conn.h
index b3f0b6318..3c4d66056 100644
--- a/nimble/controller/include/controller/ble_ll_conn.h
+++ b/nimble/controller/include/controller/ble_ll_conn.h
@@ -133,7 +133,6 @@ struct ble_ll_conn_sm_flags {
uint32_t phy_update_peer_initiated : 1;
uint32_t phy_update_host_initiated : 1;
uint32_t phy_update_host_w4event : 1;
- uint32_t le_ping_supp : 1;
#if MYNEWT_VAL(BLE_LL_CONN_INIT_AUTO_DLE)
uint32_t pending_initiate_dle : 1;
#endif
diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index 830df8efd..3dccf2460 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -2097,7 +2097,6 @@ ble_ll_conn_sm_new(struct ble_ll_conn_sm *connsm)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
connsm->auth_pyld_tmo = BLE_LL_CONN_DEF_AUTH_PYLD_TMO;
- connsm->flags.le_ping_supp = 1;
#endif
/* Add to list of active connections */
@@ -3606,8 +3605,7 @@ ble_ll_conn_rx_data_pdu(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr)
* check the MIC failure bit as that would have terminated the
* connection
*/
- if ((connsm->enc_data.enc_state == CONN_ENC_S_ENCRYPTED) &&
- connsm->flags.le_ping_supp && (acl_len != 0)) {
+ if ((connsm->enc_data.enc_state == CONN_ENC_S_ENCRYPTED) && (acl_len != 0)) {
ble_ll_conn_auth_pyld_timer_start(connsm);
}
#endif
diff --git a/nimble/controller/src/ble_ll_conn_priv.h b/nimble/controller/src/ble_ll_conn_priv.h
index a0f6ca2ef..071f2cbdf 100644
--- a/nimble/controller/src/ble_ll_conn_priv.h
+++ b/nimble/controller/src/ble_ll_conn_priv.h
@@ -251,8 +251,6 @@ int ble_ll_conn_hci_subrate_req(const uint8_t *cmdbuf, uint8_t len,
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
void ble_ll_conn_auth_pyld_timer_start(struct ble_ll_conn_sm *connsm);
void ble_ll_conn_auth_pyld_timer_cb(struct ble_npl_event *ev);
-#else
-#define ble_ll_conn_auth_pyld_timer_start(x)
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL)
diff --git a/nimble/controller/src/ble_ll_ctrl.c b/nimble/controller/src/ble_ll_ctrl.c
index 52b65aa08..11278ea34 100644
--- a/nimble/controller/src/ble_ll_ctrl.c
+++ b/nimble/controller/src/ble_ll_ctrl.c
@@ -3363,9 +3363,9 @@ ble_ll_ctrl_tx_done(struct os_mbuf *txpdu, struct ble_ll_conn_sm *connsm)
if (connsm->conn_role == BLE_LL_CONN_ROLE_PERIPHERAL) {
connsm->enc_data.enc_state = CONN_ENC_S_ENCRYPTED;
connsm->flags.encrypt_paused = 0;
- if (connsm->flags.le_ping_supp) {
- ble_ll_conn_auth_pyld_timer_start(connsm);
- }
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+ ble_ll_conn_auth_pyld_timer_start(connsm);
+#endif
}
break;
case BLE_LL_CTRL_PAUSE_ENC_RSP: