diff options
| author | Satya Calloji <satyac@broadcom.com> | 2015-03-06 10:38:22 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-04-13 00:09:06 -0700 |
| commit | 444a8da807abaf5f9e813ce70c56a79160495fb3 (patch) | |
| tree | 20a35a257203d1a87f34d887ffba13672af4288a /include | |
| parent | 8372aa5fa535ee4f09c09981b6125b54ace31fe2 (diff) | |
| download | android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.tar.gz android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.tar.bz2 android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.zip | |
LE Privacy 1.2 and LE secure connections
Bug: 19816438
Original author: Chaojing Sun <cjsun@broadcom.com>
Change-Id: I5951f4d4e038f8348a62aa6d19b2111bae0b3ecc
Diffstat (limited to 'include')
| -rw-r--r-- | include/bt_target.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/bt_target.h b/include/bt_target.h index bf49ac30a..b2550739c 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -711,7 +711,7 @@ /* First fixed channel supported */ #ifndef L2CAP_FIRST_FIXED_CHNL -#define L2CAP_FIRST_FIXED_CHNL 3 +#define L2CAP_FIRST_FIXED_CHNL 4 #endif #ifndef L2CAP_LAST_FIXED_CHNL @@ -904,11 +904,17 @@ #define SMP_MIN_ENC_KEY_SIZE 7 #endif -/* Used for conformance testing ONLY */ -#ifndef SMP_CONFORMANCE_TESTING -#define SMP_CONFORMANCE_TESTING FALSE +/* minimum link timeout after SMP pairing is done, leave room for key exchange + and racing condition for the following service connection. + Prefer greater than 0 second, and no less than default inactivity link idle + timer(L2CAP_LINK_INACTIVITY_TOUT) in l2cap) */ +#ifndef SMP_LINK_TOUT_MIN +#if (L2CAP_LINK_INACTIVITY_TOUT > 0) +#define SMP_LINK_TOUT_MIN L2CAP_LINK_INACTIVITY_TOUT +#else +#define SMP_LINK_TOUT_MIN 2 +#endif #endif - /****************************************************************************** ** ** SDP |