projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
initramfs: fix initramfs size calculation
[linux-drm-fsl-dcu.git]
/
net
/
bluetooth
/
hci_conn.c
diff --git
a/net/bluetooth/hci_conn.c
b/net/bluetooth/hci_conn.c
index b10e3cdb08f87358ca64d0db8cf83c27f5ad624a..800b6b9fbbaefe15c90406e7631acd4e25b172b3 100644
(file)
--- a/
net/bluetooth/hci_conn.c
+++ b/
net/bluetooth/hci_conn.c
@@
-358,6
+358,11
@@
struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
acl->sec_level = sec_level;
acl->auth_type = auth_type;
hci_acl_connect(acl);
+ } else {
+ if (acl->sec_level < sec_level)
+ acl->sec_level = sec_level;
+ if (acl->auth_type < auth_type)
+ acl->auth_type = auth_type;
}
if (type == ACL_LINK)