From 73f8183182ebbde26fe849238168deef62ca711a Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Thu, 25 Aug 2011 20:02:35 -0300 Subject: [PATCH] --- yaml --- r: 266338 b: refs/heads/master c: feb45eb5961b1c8c4f5e9559f48e513d2714b223 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/smp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e5976b5f1299..3ff72b044cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a492cd52b530cbcf42eb7349e6b435804a7a9271 +refs/heads/master: feb45eb5961b1c8c4f5e9559f48e513d2714b223 diff --git a/trunk/net/bluetooth/smp.c b/trunk/net/bluetooth/smp.c index 8a7eaaedd67a..63540d0c0db3 100644 --- a/trunk/net/bluetooth/smp.c +++ b/trunk/net/bluetooth/smp.c @@ -531,6 +531,8 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) BT_DBG("conn %p", conn); + hcon->pending_sec_level = BT_SECURITY_MEDIUM; + if (smp_ltk_encrypt(conn)) return 0;