From 5d6ee75bdbc07ebda8710137f48551b58f01442e Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 19 Jan 2011 12:06:48 +0530 Subject: [PATCH] --- yaml --- r: 232471 b: refs/heads/master c: 88644bb9fee591b2743a881923263bc28df4cded h: refs/heads/master i: 232469: 3e298736a05eddc403cfe9a28bee6904cb535055 232467: 9dcdc5b7110ca694b6e4be621ed180346201d3ca 232463: 28b10c4f64f40d6019f2aec67c7e1437bc7919fc v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_conn.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 20645582b066..793bc0d8d623 100644 --- 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 index 6b90a4191734..65a3fb5678eb 100644 --- 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)