projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da213f4
)
Bluetooth: Update sec_level/auth_type for already existing connections
author
Ville Tervo
<
[email protected]
>
Tue, 15 Jun 2010 12:56:05 +0000
(15:56 +0300)
committer
Marcel Holtmann
<
[email protected]
>
Thu, 8 Jul 2010 23:35:31 +0000
(20:35 -0300)
Update auth level for already existing connections if it is lower
than required by new connection.
Signed-off-by: Ville Tervo <
[email protected]
>
Reviewed-by: Emeltchenko Andrei <
[email protected]
>
Signed-off-by: Luciano Coelho <
[email protected]
>
Signed-off-by: Andrei Emeltchenko <
[email protected]
>
Signed-off-by: Marcel Holtmann <
[email protected]
>
net/bluetooth/hci_conn.c
patch
|
blob
|
history
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)