diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /net/bluetooth/hci_event.c | |
| parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
| parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) | |
| download | op-kernel-dev-eafd370dfe487facfdef499057f4eac9aa0b4bf5.zip op-kernel-dev-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.gz | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 4977491..15010a2 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3330,6 +3330,12 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, if (!conn) goto unlock; + /* For BR/EDR the necessary steps are taken through the + * auth_complete event. + */ + if (conn->type != LE_LINK) + goto unlock; + if (!ev->status) conn->sec_level = conn->pending_sec_level; |
