forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Browse source 
Conflicts:
	net/bluetooth/hci_core.c
This commit is contained in:
Gustavo Padovan 2013-09-27 11:56:14 -03:00
commit 1025c04cec
5575 changed files with 380950 additions and 176159 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net/bluetooth/l2cap_core.c
View file

@ -3755,6 +3755,13 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
sk = chan->sk;
/* For certain devices (ex: HID mouse), support for authentication,
* pairing and bonding is optional. For such devices, inorder to avoid
* the ACL alive for too long after L2CAP disconnection, reset the ACL
* disc_timeout back to HCI_DISCONN_TIMEOUT during L2CAP connect.
*/
conn->hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
bacpy(&bt_sk(sk)->src, conn->src);
bacpy(&bt_sk(sk)->dst, conn->dst);
chan->psm = psm;