From 5e760c9f891d4ce7dda5bbc707640a970d88ed0e Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Fri, 2 Sep 2011 14:51:22 -0300 Subject: [PATCH] --- yaml --- r: 266333 b: refs/heads/master c: c908df362c20be0eeef506fe62e13d835a4633f9 h: refs/heads/master i: 266331: cf3ffab9acc11992083207c67f95eadd3422ad14 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/mgmt.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b100f65dec35..27469579995e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9bf2bf03e14627fac8520468231ea11dfa37610 +refs/heads/master: c908df362c20be0eeef506fe62e13d835a4633f9 diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c index 545f84dbae85..6493e807634f 100644 --- a/trunk/net/bluetooth/mgmt.c +++ b/trunk/net/bluetooth/mgmt.c @@ -1365,13 +1365,11 @@ static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len) hci_dev_lock_bh(hdev); - if (cp->io_cap == 0x03) { - sec_level = BT_SECURITY_MEDIUM; + sec_level = BT_SECURITY_MEDIUM; + if (cp->io_cap == 0x03) auth_type = HCI_AT_DEDICATED_BONDING; - } else { - sec_level = BT_SECURITY_HIGH; + else auth_type = HCI_AT_DEDICATED_BONDING_MITM; - } entry = hci_find_adv_entry(hdev, &cp->bdaddr); if (entry)