From 1e1c56e81ce24ca92df5e4af7e870eb541742e96 Mon Sep 17 00:00:00 2001 From: Waldemar Rymarkiewicz Date: Thu, 2 Jun 2011 14:24:52 +0200 Subject: [PATCH] --- yaml --- r: 255713 b: refs/heads/master c: ef4177e2bf92543e422fae154888062376e2283d h: refs/heads/master i: 255711: 8764de69cd80993a349a6941fed6d07cda308b87 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_conn.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6cbd5957660b..6f2f3fea5975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14b12d0b98f87162b7e9e93dde66d1af97886567 +refs/heads/master: ef4177e2bf92543e422fae154888062376e2283d diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c index 0408a93570d6..37f5a174f072 100644 --- a/trunk/net/bluetooth/hci_conn.c +++ b/trunk/net/bluetooth/hci_conn.c @@ -643,9 +643,7 @@ int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level) if (sec_level != BT_SECURITY_HIGH) return 1; /* Accept if non-secure is required */ - if (conn->key_type == HCI_LK_AUTH_COMBINATION || - (conn->key_type == HCI_LK_COMBINATION && - conn->pin_length == 16)) + if (conn->sec_level == BT_SECURITY_HIGH) return 1; return 0; /* Reject not secure link */