diff options
author | Xin Long <lucien.xin@gmail.com> | 2017-03-18 08:03:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-21 21:32:36 -0400 |
commit | 23bb09cfbe04076ef647da3889a5a5ab6cbe6f15 (patch) | |
tree | a3192029dcb3700d2d06c4f219740ec852369bc9 /net/sctp/outqueue.c | |
parent | 1f904495b79003cd3d881de8731377d48fcbc7e3 (diff) |
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: 8dbdf1f5b09c ("sctp: implement prsctp PRIO policy")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r-- | net/sctp/outqueue.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index db352e5d61f8..025ccff67072 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -382,17 +382,18 @@ static int sctp_prsctp_prune_sent(struct sctp_association *asoc, | |||
382 | } | 382 | } |
383 | 383 | ||
384 | static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, | 384 | static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, |
385 | struct sctp_sndrcvinfo *sinfo, | 385 | struct sctp_sndrcvinfo *sinfo, int msg_len) |
386 | struct list_head *queue, int msg_len) | ||
387 | { | 386 | { |
387 | struct sctp_outq *q = &asoc->outqueue; | ||
388 | struct sctp_chunk *chk, *temp; | 388 | struct sctp_chunk *chk, *temp; |
389 | 389 | ||
390 | list_for_each_entry_safe(chk, temp, queue, list) { | 390 | list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) { |
391 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || | 391 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || |
392 | chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive) | 392 | chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive) |
393 | continue; | 393 | continue; |
394 | 394 | ||
395 | list_del_init(&chk->list); | 395 | list_del_init(&chk->list); |
396 | q->out_qlen -= chk->skb->len; | ||
396 | asoc->sent_cnt_removable--; | 397 | asoc->sent_cnt_removable--; |
397 | asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++; | 398 | asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++; |
398 | 399 | ||
@@ -431,9 +432,7 @@ void sctp_prsctp_prune(struct sctp_association *asoc, | |||
431 | return; | 432 | return; |
432 | } | 433 | } |
433 | 434 | ||
434 | sctp_prsctp_prune_unsent(asoc, sinfo, | 435 | sctp_prsctp_prune_unsent(asoc, sinfo, msg_len); |
435 | &asoc->outqueue.out_chunk_list, | ||
436 | msg_len); | ||
437 | } | 436 | } |
438 | 437 | ||
439 | /* Mark all the eligible packets on a transport for retransmission. */ | 438 | /* Mark all the eligible packets on a transport for retransmission. */ |