---

yaml --- r: 134728 b: refs/heads/master c: 255c760 h: refs/heads/master v: v3
git-mirror · Feb 27, 2009 · 938f9e8 · 938f9e8
1 parent 39b1a24
commit 938f9e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);