---

yaml --- r: 306942 b: refs/heads/master c: c6585a4 h: refs/heads/master v: v3
git-mirror · May 16, 2012 · 2e84bb8 · 2e84bb8
1 parent df5790e
commit 2e84bb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;