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

Commit 105bdf9e authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Initialize new l2cap_chan structure members 



Structure members used by ERTM or streaming mode need to be
initialized when an ERTM or streaming mode link is configured.  Some
duplicate code is also eliminated by moving in to the ERTM init
function.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Signed-off-by: default avatarGustavo Padovan <gustavo@padovan.org>
parent b5c6aaed

net/bluetooth/l2cap_core.c

+17 −8
Original line number Diff line number Diff line
@@ -2314,17 +2314,30 @@ static inline int l2cap_ertm_init(struct l2cap_chan *chan) 
{

	int err;



	chan->next_tx_seq = 0;

	chan->expected_tx_seq = 0;

	chan->expected_ack_seq = 0;

	chan->unacked_frames = 0;

	chan->buffer_seq = 0;

	chan->num_acked = 0;

	chan->frames_sent = 0;

	chan->last_acked_seq = 0;

	chan->sdu = NULL;

	chan->sdu_last_frag = NULL;

	chan->sdu_len = 0;



	if (chan->mode != L2CAP_MODE_ERTM)

		return 0;



	chan->rx_state = L2CAP_RX_STATE_RECV;

	chan->tx_state = L2CAP_TX_STATE_XMIT;



	INIT_DELAYED_WORK(&chan->retrans_timer, l2cap_retrans_timeout);

	INIT_DELAYED_WORK(&chan->monitor_timer, l2cap_monitor_timeout);

	INIT_DELAYED_WORK(&chan->ack_timer, l2cap_ack_timeout);



	skb_queue_head_init(&chan->srej_q);

	skb_queue_head_init(&chan->tx_q);



	INIT_LIST_HEAD(&chan->srej_l);

	err = l2cap_seq_list_init(&chan->srej_list, chan->tx_win);
@@ -3192,10 +3205,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 


		l2cap_state_change(chan, BT_CONNECTED);



		chan->next_tx_seq = 0;

		chan->expected_tx_seq = 0;

		skb_queue_head_init(&chan->tx_q);

		if (chan->mode == L2CAP_MODE_ERTM)

		if (chan->mode == L2CAP_MODE_ERTM ||

		    chan->mode == L2CAP_MODE_STREAMING)

			err = l2cap_ertm_init(chan);



		if (err < 0)
@@ -3327,10 +3338,8 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
		set_default_fcs(chan);



		l2cap_state_change(chan, BT_CONNECTED);

		chan->next_tx_seq = 0;

		chan->expected_tx_seq = 0;

		skb_queue_head_init(&chan->tx_q);

		if (chan->mode ==  L2CAP_MODE_ERTM)

		if (chan->mode == L2CAP_MODE_ERTM ||

		    chan->mode == L2CAP_MODE_STREAMING)

			err = l2cap_ertm_init(chan);



		if (err < 0)