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 /net/bluetooth/l2cap_core.c | |
| 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 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index cc506fe99b4d..dfc1edb168b7 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1361,7 +1361,7 @@ static bool l2cap_check_enc_key_size(struct hci_conn *hcon) * actually encrypted before enforcing a key size. */ return (!test_bit(HCI_CONN_ENCRYPT, &hcon->flags) || - hcon->enc_key_size >= HCI_MIN_ENC_KEY_SIZE); + hcon->enc_key_size >= hcon->hdev->min_enc_key_size); } static void l2cap_do_start(struct l2cap_chan *chan) |