projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '3cf2f34' into sched/core, to fix build error
[linux-2.6-block.git]
/
net
/
bluetooth
/
hci_event.c
diff --git
a/net/bluetooth/hci_event.c
b/net/bluetooth/hci_event.c
index 74014420b3c7daff29c2ebbfb8fa228efac3aa78..682f33a383660fac1ce141aa6bd6c54026be973e 100644
(file)
--- 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;