You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/06/21 23:42:54 UTC

incubator-mynewt-core git commit: BLE Host - Fix build error caused by prev commit.

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop a27e86fff -> f664c5091


BLE Host - Fix build error caused by prev commit.

The build errors were caused by:

commit a27e86ffffcaef04dce633901bbecf60c0033027
Author: Christopher Collins <cc...@apache.org>
Date:   Tue Jun 21 15:50:42 2016 -0700

    BLE Host - Clean up runtime settings.


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/f664c509
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f664c509
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f664c509

Branch: refs/heads/develop
Commit: f664c50911b68546e9b11e86f97ef8d0d917d76b
Parents: a27e86f
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jun 21 16:42:17 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Jun 21 16:42:17 2016 -0700

----------------------------------------------------------------------
 net/nimble/host/src/ble_hs_cfg.c            | 4 ----
 net/nimble/host/src/test/ble_hs_test_util.c | 3 ---
 2 files changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f664c509/net/nimble/host/src/ble_hs_cfg.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_cfg.c b/net/nimble/host/src/ble_hs_cfg.c
index 05f9cfb..6fe0236 100644
--- a/net/nimble/host/src/ble_hs_cfg.c
+++ b/net/nimble/host/src/ble_hs_cfg.c
@@ -24,14 +24,10 @@ const struct ble_hs_cfg ble_hs_cfg_dflt = {
     .max_hci_bufs = 8,
 
     /** Connection settings. */
-    .max_outstanding_pkts_per_conn = 5,
-
 #if NIMBLE_OPT(CONNECT)
     .max_connections = NIMBLE_OPT(MAX_CONNECTIONS),
-    .max_conn_update_entries = 4,
 #else
     .max_connections = 0,
-    .max_conn_update_entries = 0,
 #endif
 
     /** GATT server settings. */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f664c509/net/nimble/host/src/test/ble_hs_test_util.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/test/ble_hs_test_util.c b/net/nimble/host/src/test/ble_hs_test_util.c
index e2f28c7..90448da 100644
--- a/net/nimble/host/src/test/ble_hs_test_util.c
+++ b/net/nimble/host/src/test/ble_hs_test_util.c
@@ -848,9 +848,6 @@ ble_hs_test_util_init(void)
 
     ble_hci_set_phony_ack_cb(NULL);
 
-    /* Don't limit a connection's ability to transmit; simplify tests. */
-    ble_hs_cfg.max_outstanding_pkts_per_conn = 0;
-
     ble_hs_test_util_prev_hci_tx_clear();
 
     ble_hs_test_util_set_public_addr(g_dev_addr);