From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 9 Nov 2011 19:54:33 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=312fef7d18adda2be822d31916547f84ed6af28b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next

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

312fef7d18adda2be822d31916547f84ed6af28b
diff --cc include/net/bluetooth/l2cap.h
index 6cc18f37167,9280bff5543..875021ad067
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@@ -38,12 -41,12 +41,15 @@@
  #define L2CAP_DEFAULT_MAX_PDU_SIZE	1009    /* Sized for 3-DH5 packet */
  #define L2CAP_DEFAULT_ACK_TO		200
  #define L2CAP_LE_DEFAULT_MTU		23
+ #define L2CAP_DEFAULT_MAX_SDU_SIZE	0xFFFF
+ #define L2CAP_DEFAULT_SDU_ITIME		0xFFFFFFFF
+ #define L2CAP_DEFAULT_ACC_LAT		0xFFFFFFFF
  
 -#define L2CAP_CONN_TIMEOUT	(40000) /* 40 seconds */
 -#define L2CAP_INFO_TIMEOUT	(4000)  /*  4 seconds */
 +#define L2CAP_DISC_TIMEOUT             (100)
 +#define L2CAP_DISC_REJ_TIMEOUT         (5000)  /*  5 seconds */
 +#define L2CAP_ENC_TIMEOUT              (5000)  /*  5 seconds */
 +#define L2CAP_CONN_TIMEOUT             (40000) /* 40 seconds */
 +#define L2CAP_INFO_TIMEOUT             (4000)  /*  4 seconds */
  
  /* L2CAP socket address */
  struct sockaddr_l2 {
diff --cc net/bluetooth/l2cap_sock.c
index e8292369cdc,664762e89ec..567b585d980
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -930,13 -978,9 +980,11 @@@ static void l2cap_sock_init(struct soc
  		chan->fcs  = pchan->fcs;
  		chan->max_tx = pchan->max_tx;
  		chan->tx_win = pchan->tx_win;
+ 		chan->tx_win_max = pchan->tx_win_max;
  		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) {