diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-17 22:37:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-17 22:37:47 +0300 |
| commit | 42eb4554702d40668968da333ffa37cc0a15ff9e (patch) | |
| tree | 83e5ce4df0c549608b365a84612707a88240474f /include | |
| parent | 712042313b23b5df7451faf4b279beb3025e990c (diff) | |
| parent | 58a96fc35375ab87db7c5b69336f5befde1b548f (diff) | |
| download | linux-42eb4554702d40668968da333ffa37cc0a15ff9e.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2019-08-17
Here's a set of Bluetooth fixes for the 5.3-rc series:
- Multiple fixes for Qualcomm (btqca & hci_qca) drivers
- Minimum encryption key size debugfs setting (this is required for
Bluetooth Qualification)
- Fix hidp_send_message() to have a meaningful return value
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index ded574b32c20..ffc95b382eb5 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -278,6 +278,7 @@ struct hci_dev { __u16 conn_info_min_age; __u16 conn_info_max_age; __u16 auth_payload_timeout; + __u8 min_enc_key_size; __u8 ssp_debug_mode; __u8 hw_error_code; __u32 clock; |