From add32d72e3548ebf4342bebca5c27e7126cf2c37 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Tue, 5 Apr 2011 15:24:40 -0300
Subject: [PATCH] --- yaml --- r: 246928 b: refs/heads/master c:
 cd69a03af1106c486033df600c7945957ea5abeb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 66409d297ea1..c2fcba2d0f84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58d35f87effa0235181a24d55576aaa756ef7312
+refs/heads/master: cd69a03af1106c486033df600c7945957ea5abeb
diff --git a/trunk/net/bluetooth/l2cap_sock.c b/trunk/net/bluetooth/l2cap_sock.c
index b2bfa1e0d74e..473e5973d8fe 100644
--- a/trunk/net/bluetooth/l2cap_sock.c
+++ b/trunk/net/bluetooth/l2cap_sock.c
@@ -269,7 +269,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)
 		goto done;
 	}
 
-	if (!l2cap_pi(sk)->psm && !l2cap_pi(sk)->dcid) {
+	if (!l2cap_pi(sk)->psm && !l2cap_pi(sk)->scid) {
 		bdaddr_t *src = &bt_sk(sk)->src;
 		u16 psm;