From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:47:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111103~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca607ffe4825dedad9dffb67a25a7858c2751201;p=karo-tx-linux.git

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
	net/bluetooth/l2cap_sock.c
---

ca607ffe4825dedad9dffb67a25a7858c2751201
diff --cc net/bluetooth/l2cap_sock.c
index e8292369cdcf,646aefc4f1d7..930a95b5016f
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -931,12 -944,7 +946,9 @@@ static void l2cap_sock_init(struct soc
  		chan->max_tx = pchan->max_tx;
  		chan->tx_win = pchan->tx_win;
  		chan->sec_level = pchan->sec_level;
- 		chan->role_switch = pchan->role_switch;
- 		chan->force_reliable = pchan->force_reliable;
- 		chan->flushable = pchan->flushable;
- 		chan->force_active = pchan->force_active;
+ 		chan->flags = pchan->flags;
 +
 +		security_sk_clone(parent, sk);
  	} else {
  
  		switch (sk->sk_type) {