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

Bluetooth: EWS: fix max_pdu calculation 



Fix max_pdu_size calculationin for RFC. Change magic number to human readable
defines.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 03a51213

net/bluetooth/l2cap_core.c

+28 −14
Original line number Diff line number Diff line
@@ -1990,6 +1990,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data) 
	struct l2cap_conf_req *req = data;

	struct l2cap_conf_rfc rfc = { .mode = chan->mode };

	void *ptr = req->data;

	u16 size;



	BT_DBG("chan %p", chan);
@@ -2037,9 +2038,12 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data) 
		rfc.max_transmit    = chan->max_tx;

		rfc.retrans_timeout = 0;

		rfc.monitor_timeout = 0;

		rfc.max_pdu_size    = cpu_to_le16(L2CAP_DEFAULT_MAX_PDU_SIZE);

		if (L2CAP_DEFAULT_MAX_PDU_SIZE > chan->conn->mtu - 10)

			rfc.max_pdu_size = cpu_to_le16(chan->conn->mtu - 10);



		size = min_t(u16, L2CAP_DEFAULT_MAX_PDU_SIZE, chan->conn->mtu -

						L2CAP_EXT_HDR_SIZE -

						L2CAP_SDULEN_SIZE -

						L2CAP_FCS_SIZE);

		rfc.max_pdu_size = cpu_to_le16(size);



		l2cap_txwin_setup(chan);
@@ -2072,9 +2076,12 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data) 
		rfc.max_transmit    = 0;

		rfc.retrans_timeout = 0;

		rfc.monitor_timeout = 0;

		rfc.max_pdu_size    = cpu_to_le16(L2CAP_DEFAULT_MAX_PDU_SIZE);

		if (L2CAP_DEFAULT_MAX_PDU_SIZE > chan->conn->mtu - 10)

			rfc.max_pdu_size = cpu_to_le16(chan->conn->mtu - 10);



		size = min_t(u16, L2CAP_DEFAULT_MAX_PDU_SIZE, chan->conn->mtu -

						L2CAP_EXT_HDR_SIZE -

						L2CAP_SDULEN_SIZE -

						L2CAP_FCS_SIZE);

		rfc.max_pdu_size = cpu_to_le16(size);



		l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc),

							(unsigned long) &rfc);
@@ -2110,6 +2117,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data) 
	struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };

	u16 mtu = L2CAP_DEFAULT_MTU;

	u16 result = L2CAP_CONF_SUCCESS;

	u16 size;



	BT_DBG("chan %p", chan);
@@ -2219,10 +2227,13 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data) 


			chan->remote_max_tx = rfc.max_transmit;



			if (le16_to_cpu(rfc.max_pdu_size) > chan->conn->mtu - 10)

				rfc.max_pdu_size = cpu_to_le16(chan->conn->mtu - 10);



			chan->remote_mps = le16_to_cpu(rfc.max_pdu_size);

			size = min_t(u16, le16_to_cpu(rfc.max_pdu_size),

						chan->conn->mtu -

						L2CAP_EXT_HDR_SIZE -

						L2CAP_SDULEN_SIZE -

						L2CAP_FCS_SIZE);

			rfc.max_pdu_size = cpu_to_le16(size);

			chan->remote_mps = size;



			rfc.retrans_timeout =

				le16_to_cpu(L2CAP_DEFAULT_RETRANS_TO);
@@ -2237,10 +2248,13 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data) 
			break;



		case L2CAP_MODE_STREAMING:

			if (le16_to_cpu(rfc.max_pdu_size) > chan->conn->mtu - 10)

				rfc.max_pdu_size = cpu_to_le16(chan->conn->mtu - 10);



			chan->remote_mps = le16_to_cpu(rfc.max_pdu_size);

			size = min_t(u16, le16_to_cpu(rfc.max_pdu_size),

						chan->conn->mtu -

						L2CAP_EXT_HDR_SIZE -

						L2CAP_SDULEN_SIZE -

						L2CAP_FCS_SIZE);

			rfc.max_pdu_size = cpu_to_le16(size);

			chan->remote_mps = size;



			set_bit(CONF_MODE_DONE, &chan->conf_state);