diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-26 01:39:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-26 01:39:38 -0400 |
| commit | 89eb6e096782b749eadead3824b3a65255c7d0e3 (patch) | |
| tree | da71c7dce281baefed6e5ad7a5d74d6f300bfb62 /include/net | |
| parent | 8b4483658364f05b2e32845c8f445cdfd9452286 (diff) | |
| parent | d5bb334a8e171b262e48f378bd2096c0ea458265 (diff) | |
| download | linux-next-89eb6e096782b749eadead3824b3a65255c7d0e3.tar.gz linux-next-89eb6e096782b749eadead3824b3a65255c7d0e3.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2019-04-25
Here's the main bluetooth-next pull request for the 5.2 kernel.
- Added support for Mediatek SDIO controllers
- Added support for Broadcom BCM2076B1 UART controller
- Added support for Marvel SD8987 chipset
- Fix buffer overflow bug in hidp protocol
- Various other smaller fixes & improvements
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 094e61e07030..05b1b96f4d9e 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -190,6 +190,9 @@ struct adv_info { #define HCI_MAX_SHORT_NAME_LENGTH 10 +/* Min encryption key size to match with SMP */ +#define HCI_MIN_ENC_KEY_SIZE 7 + /* Default LE RPA expiry time, 15 minutes */ #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60) |