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

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

Bluetooth: Fix missing L2CAP EWS Conf parameter 



If L2CAP_FEAT_FCS is not supported we sould miss EWS option
configuration because of break. Make code more readable by
combining FCS configuration in the single block.

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

net/bluetooth/l2cap_core.c

+15 −17
Original line number Diff line number Diff line
@@ -3106,18 +3106,17 @@ done: 
		if (test_bit(FLAG_EFS_ENABLE, &chan->flags))

			l2cap_add_opt_efs(&ptr, chan);



		if (!(chan->conn->feat_mask & L2CAP_FEAT_FCS))

			break;

		if (test_bit(FLAG_EXT_CTRL, &chan->flags))

			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,

					   chan->tx_win);



		if (chan->conn->feat_mask & L2CAP_FEAT_FCS)

			if (chan->fcs == L2CAP_FCS_NONE ||

			    test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) {

				chan->fcs = L2CAP_FCS_NONE;

			l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, chan->fcs);

				l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,

						   chan->fcs);

			}



		if (test_bit(FLAG_EXT_CTRL, &chan->flags))

			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,

					   chan->tx_win);

		break;



	case L2CAP_MODE_STREAMING:
@@ -3139,13 +3138,12 @@ done: 
		if (test_bit(FLAG_EFS_ENABLE, &chan->flags))

			l2cap_add_opt_efs(&ptr, chan);



		if (!(chan->conn->feat_mask & L2CAP_FEAT_FCS))

			break;



		if (chan->conn->feat_mask & L2CAP_FEAT_FCS)

			if (chan->fcs == L2CAP_FCS_NONE ||

			    test_bit(CONF_NO_FCS_RECV, &chan->conf_state)) {

				chan->fcs = L2CAP_FCS_NONE;

			l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1, chan->fcs);

				l2cap_add_conf_opt(&ptr, L2CAP_CONF_FCS, 1,

						   chan->fcs);

			}

		break;

	}