This closes #156.

Merge remote-tracking branch 'sjanc/sm' into develop

* sjanc/sm:
  nimble/sm: Remove not needed stack variables
  nimble/sm: Add support for rejecting pairing with disabled SM


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

Branch: refs/heads/develop
Commit: 4a287aa01906e98a2f512ab7faff008e443f8243
Parents: 0442a1e eece2d7
Author: Christopher Collins <[email protected]>
Authored: Sat Jan 7 07:36:35 2017 -0800
Committer: Christopher Collins <[email protected]>
Committed: Sat Jan 7 07:36:35 2017 -0800

----------------------------------------------------------------------
 net/nimble/host/src/ble_hs_conn.c |   6 +-
 net/nimble/host/src/ble_sm.c      | 105 ++++++++++++++++++---------------
 net/nimble/host/src/ble_sm_priv.h |   5 +-
 net/nimble/host/src/ble_sm_sc.c   |   6 +-
 4 files changed, 65 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4a287aa0/net/nimble/host/src/ble_sm.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4a287aa0/net/nimble/host/src/ble_sm_priv.h
----------------------------------------------------------------------

Reply via email to