From 938f9e8bc04a10d10ab74dc5e5b3f7b962665b4a Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 4 Feb 2009 21:07:19 +0100
Subject: [PATCH] --- yaml --- r: 134728 b: refs/heads/master c:
 255c76014af74165428e7aa16414b857e2bdccf2 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33420fefb0be..b08f343ddc36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43c2e57f94c15744495fee564610aa24602b3824
+refs/heads/master: 255c76014af74165428e7aa16414b857e2bdccf2
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 71a064fa0285..b677af671f31 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -2420,6 +2420,9 @@ static int l2cap_disconn_ind(struct hci_conn *hcon, u8 reason)
 
 static inline void l2cap_check_encryption(struct sock *sk, u8 encrypt)
 {
+	if (sk->sk_type != SOCK_SEQPACKET)
+		return;
+
 	if (encrypt == 0x00) {
 		if (l2cap_pi(sk)->sec_level == BT_SECURITY_MEDIUM) {
 			l2cap_sock_clear_timer(sk);