---

yaml --- r: 232471 b: refs/heads/master c: 88644bb h: refs/heads/master i: 232469: 3e29873 232467: 9dcdc5b 232463: 28b10c4 v: v3
git-mirror · Jan 19, 2011 · 5d6ee75 · 5d6ee75
1 parent 51d6bf8
commit 5d6ee75
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 683d949a7fbf33c244670e34d35c460e0d6558cb
+refs/heads/master: 88644bb9fee591b2743a881923263bc28df4cded
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
@@ -382,11 +382,6 @@ 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)