Commit 23bb09cf authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: out_qlen should be updated when pruning unsent queue 



This patch is to fix the issue that sctp_prsctp_prune_sent forgot
to update q->out_qlen when removing a chunk from unsent queue.

Fixes: 8dbdf1f5 ("sctp: implement prsctp PRIO policy")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f904495

net/sctp/outqueue.c

+5 −6
Original line number Diff line number Diff line
@@ -382,17 +382,18 @@ static int sctp_prsctp_prune_sent(struct sctp_association *asoc, 
}



static int sctp_prsctp_prune_unsent(struct sctp_association *asoc,

				    struct sctp_sndrcvinfo *sinfo,

				    struct list_head *queue, int msg_len)

				    struct sctp_sndrcvinfo *sinfo, int msg_len)

{

	struct sctp_outq *q = &asoc->outqueue;

	struct sctp_chunk *chk, *temp;



	list_for_each_entry_safe(chk, temp, queue, list) {

	list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) {

		if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) ||

		    chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive)

			continue;



		list_del_init(&chk->list);

		q->out_qlen -= chk->skb->len;

		asoc->sent_cnt_removable--;

		asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;
@@ -431,9 +432,7 @@ void sctp_prsctp_prune(struct sctp_association *asoc, 
			return;

	}



	sctp_prsctp_prune_unsent(asoc, sinfo,

				 &asoc->outqueue.out_chunk_list,

				 msg_len);

	sctp_prsctp_prune_unsent(asoc, sinfo, msg_len);

}



/* Mark all the eligible packets on a transport for retransmission.  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE