Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8936fa6d authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: L2CAP: Fix using default Flush Timeout for EFS 



There are two Flush Timeouts: one is old Flush Timeot Option
which is 2 octets and the second is Flush Timeout inside EFS
which is 4 octets long.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 0b4558e3

include/net/bluetooth/l2cap.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
/* L2CAP defaults */

#define L2CAP_DEFAULT_MTU		672

#define L2CAP_DEFAULT_MIN_MTU		48

#define L2CAP_DEFAULT_FLUSH_TO		0xffff

#define L2CAP_DEFAULT_FLUSH_TO		0xFFFF

#define L2CAP_EFS_DEFAULT_FLUSH_TO	0xFFFFFFFF

#define L2CAP_DEFAULT_TX_WINDOW		63

#define L2CAP_DEFAULT_EXT_WINDOW	0x3FFF

#define L2CAP_DEFAULT_MAX_TX		3

net/bluetooth/l2cap_core.c

+3 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan) 
	chan->local_msdu	= L2CAP_DEFAULT_MAX_SDU_SIZE;

	chan->local_sdu_itime	= L2CAP_DEFAULT_SDU_ITIME;

	chan->local_acc_lat	= L2CAP_DEFAULT_ACC_LAT;

	chan->local_flush_to	= L2CAP_DEFAULT_FLUSH_TO;

	chan->local_flush_to	= L2CAP_EFS_DEFAULT_FLUSH_TO;



	l2cap_chan_hold(chan);
@@ -2727,7 +2727,7 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan) 
		efs.msdu	= cpu_to_le16(chan->local_msdu);

		efs.sdu_itime	= cpu_to_le32(chan->local_sdu_itime);

		efs.acc_lat	= __constant_cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);

		efs.flush_to	= __constant_cpu_to_le32(L2CAP_DEFAULT_FLUSH_TO);

		efs.flush_to	= __constant_cpu_to_le32(L2CAP_EFS_DEFAULT_FLUSH_TO);

		break;



	case L2CAP_MODE_STREAMING: