diff options
author | David S. Miller | 2019-08-17 21:37:47 +0200 |
---|---|---|
committer | David S. Miller | 2019-08-17 21:37:47 +0200 |
commit | 42eb4554702d40668968da333ffa37cc0a15ff9e (patch) | |
tree | 83e5ce4df0c549608b365a84612707a88240474f /drivers/bluetooth/btqca.h | |
parent | tipc: fix false detection of retransmit failures (diff) | |
parent | Bluetooth: Add debug setting for changing minimum encryption key size (diff) | |
download | kernel-qcow2-linux-42eb4554702d40668968da333ffa37cc0a15ff9e.tar.gz kernel-qcow2-linux-42eb4554702d40668968da333ffa37cc0a15ff9e.tar.xz kernel-qcow2-linux-42eb4554702d40668968da333ffa37cc0a15ff9e.zip |
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 'drivers/bluetooth/btqca.h')
-rw-r--r-- | drivers/bluetooth/btqca.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index 6a291a7a5d96..69c5315a65fd 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -13,6 +13,7 @@ #define EDL_PATCH_TLV_REQ_CMD (0x1E) #define EDL_NVM_ACCESS_SET_REQ_CMD (0x01) #define MAX_SIZE_PER_TLV_SEGMENT (243) +#define QCA_PRE_SHUTDOWN_CMD (0xFC08) #define EDL_CMD_REQ_RES_EVT (0x00) #define EDL_PATCH_VER_RES_EVT (0x19) @@ -135,6 +136,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, const char *firmware_name); int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version); int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr); +int qca_send_pre_shutdown_cmd(struct hci_dev *hdev); static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) { return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3998; @@ -167,4 +169,9 @@ static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type) { return false; } + +static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) +{ + return -EOPNOTSUPP; +} #endif |