Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...

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

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc include/net/bluetooth/l2cap.h
index 6cc18f37167519260e15d1ad20d7bf2f145c86c5,9280bff55430238f729b32961fd4e3c4a418829c..875021ad0675098e6e9bb5cfa1cfc5dea170bcad
--- 1/include/net/bluetooth/l2cap.h
--- 2/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/hci_conn.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
index e8292369cdcf68981b4a59969b2c4af41b703f90,664762e89ecf0271f2f3dc26d08ca5e29cd96753..567b585d9805f2232114bc8ff2c49301e53890e1
--- 1/net/bluetooth/l2cap_sock.c
--- 2/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) {

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge