[mynewt-nimble] branch master updated: nimble/ll: Fix build issue when BLE_LL_STRICT_CONN_SCHEDULING is set

[ry...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 57cfefa  nimble/ll: Fix build issue when BLE_LL_STRICT_CONN_SCHEDULING is set
57cfefa is described below

commit 57cfefaca8af6cd202f352409c5a1de4956ce995
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Tue Nov 19 14:17:26 2019 +0100

    nimble/ll: Fix build issue when BLE_LL_STRICT_CONN_SCHEDULING is set
    
    This patch fixes that:
    
    Error: repos/apache-mynewt-nimble/nimble/controller/src/ble_ll_conn.c: In function 'ble_ll_conn_end':
    repos/apache-mynewt-nimble/nimble/controller/src/ble_ll_conn.c:1818:13: error: redeclaration of 'sr' with no linkage
         os_sr_t sr;
                 ^~
---
 nimble/controller/src/ble_ll_conn.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index 133bab8..4c39111 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -1814,9 +1814,6 @@ ble_ll_conn_end(struct ble_ll_conn_sm *connsm, uint8_t ble_err)
     struct os_mbuf *m;
     struct os_mbuf_pkthdr *pkthdr;
     os_sr_t sr;
-#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
-    os_sr_t sr;
-#endif
 
     /* Remove scheduler events just in case */
     ble_ll_sched_rmv_elem(&connsm->conn_sch);