From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 27 Apr 2017 13:13:16 +0000 (+0800)
Subject: Merge branch 'bugfix/btdm_gattc_adv_bug' into 'master'
X-Git-Tag: v2.1-rc1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0759897bfb579bed9c3bec3b73643b08839a0586;p=esp-idf

Merge branch 'bugfix/btdm_gattc_adv_bug' into 'master'

component/bt: Fix memory leakage, connection fail bugs

- Fix memory leakage while deregisting gatt app
- Fix Android connection failed problem
- Fix service_uuid_len error in adv data

See merge request !706
---

0759897bfb579bed9c3bec3b73643b08839a0586
diff --cc components/bt/bluedroid/include/bt_target.h
index 9a77e6c8f8,21fa74ce2f..02c0486a82
--- a/components/bt/bluedroid/include/bt_target.h
+++ b/components/bt/bluedroid/include/bt_target.h
@@@ -717,9 -684,10 +717,9 @@@
  #define L2CAP_CLIENT_INCLUDED FALSE
  #endif
  
 -
  /* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
  #ifndef MAX_ACL_CONNECTIONS
- #define MAX_L2CAP_LINKS             3
+ #define MAX_L2CAP_LINKS             5
  #else
  #define MAX_L2CAP_LINKS             MAX_ACL_CONNECTIONS
  #endif