From 2e84bb89828dbadc1612238c2ddbb06a211f618e Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo@padovan.org>
Date: Mon, 7 May 2012 03:07:26 -0300
Subject: [PATCH] --- yaml --- r: 306942 b: refs/heads/master c:
 c6585a4da0c709a7a9f59aab68869298b52ca1e1 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/bluetooth/l2cap_sock.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4d5baa03a91..6e2ba85c0956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6a5568c03c4805d4d250f6bd9d468eeeb4ea059
+refs/heads/master: c6585a4da0c709a7a9f59aab68869298b52ca1e1
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index f6d8e13197d6..f52d58e05d02 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/net/bluetooth/l2cap_sock.c
@@ -379,7 +379,10 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
 		}
 
 		memset(&sec, 0, sizeof(sec));
-		sec.level = chan->sec_level;
+		if (chan->conn)
+			sec.level = chan->conn->hcon->sec_level;
+		else
+			sec.level = chan->sec_level;
 
 		if (sk->sk_state == BT_CONNECTED)
 			sec.key_size = chan->conn->hcon->enc_key_size;