Subject: linux-next: manual merge of the wireless tree with the wireless-current tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 21 Jun 2011 11:49:57 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
net/bluetooth/l2cap_core.c between commit df3c3931ec58 ("Bluetooth: Fix
accepting connect requests for defer_setup") from the wireless-current
tree and commit ab07801d2898 ("Bluetooth: create channel timer to replace
sk_timer") from the wireless tree.

Jusr context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/bluetooth/l2cap_core.c
index 56fdd91,dff9d76..0000000
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -4002,24 -4205,15 +4205,24 @@@ static int l2cap_security_cfm(struct hc
  			}
  		} else if (sk->sk_state == BT_CONNECT2) {
  			struct l2cap_conn_rsp rsp;
 -			__u16 result;
 +			__u16 res, stat;
  
  			if (!status) {
 -				sk->sk_state = BT_CONFIG;
 -				result = L2CAP_CR_SUCCESS;
 +				if (bt_sk(sk)->defer_setup) {
 +					struct sock *parent = bt_sk(sk)->parent;
 +					res = L2CAP_CR_PEND;
 +					stat = L2CAP_CS_AUTHOR_PEND;
 +					parent->sk_data_ready(parent, 0);
 +				} else {
 +					sk->sk_state = BT_CONFIG;
 +					res = L2CAP_CR_SUCCESS;
 +					stat = L2CAP_CS_NO_INFO;
 +				}
  			} else {
  				sk->sk_state = BT_DISCONN;
- 				l2cap_sock_set_timer(sk, HZ / 10);
+ 				l2cap_chan_set_timer(chan, HZ / 10);
 -				result = L2CAP_CR_SEC_BLOCK;
 +				res = L2CAP_CR_SEC_BLOCK;
 +				stat = L2CAP_CS_NO_INFO;
  			}
  
  			rsp.scid   = cpu_to_le16(chan->dcid);