commit 033b1142f4bd44a116d1356fe4a0510437ceddf9
author David S. Miller <davem@davemloft.net> Thu Jul 21 13:38:42 2011 -0700
committer David S. Miller <davem@davemloft.net> Thu Jul 21 13:38:42 2011 -0700
tree d2a971a7dc9f3a1af8035e38419c4c4ad8c22632
parent f5caadbb3d8fc0b71533e880c684b2230bdb76ac
parent e6625fa48e6580a74b7e700efd7e6463e282810b

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/bluetooth/l2cap_core.c

net/bluetooth/l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index f7f8e2c..3204ba8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -763,7 +763,8 @@
 					struct sock *parent = bt_sk(sk)->parent;
 					rsp.result = cpu_to_le16(L2CAP_CR_PEND);
 					rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
-					parent->sk_data_ready(parent, 0);
+					if (parent)
+						parent->sk_data_ready(parent, 0);
 
 				} else {
 					l2cap_state_change(chan, BT_CONFIG);
@@ -2523,8 +2524,7 @@
 
 	sk = chan->sk;
 
-	if ((bt_sk(sk)->defer_setup && chan->state != BT_CONNECT2) ||
-		 (!bt_sk(sk)->defer_setup && chan->state != BT_CONFIG)) {
+	if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {
 		struct l2cap_cmd_rej_cid rej;
 
 		rej.reason = cpu_to_le16(L2CAP_REJ_INVALID_CID);
@@ -4150,7 +4150,8 @@
 					struct sock *parent = bt_sk(sk)->parent;
 					res = L2CAP_CR_PEND;
 					stat = L2CAP_CS_AUTHOR_PEND;
-					parent->sk_data_ready(parent, 0);
+					if (parent)
+						parent->sk_data_ready(parent, 0);
 				} else {
 					l2cap_state_change(chan, BT_CONFIG);
 					res = L2CAP_CR_SUCCESS;