diff options
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r-- | net/sctp/outqueue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 72e54a416af6..107233da5cc9 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
@@ -326,7 +326,7 @@ int sctp_outq_tail(struct sctp_outq *q, struct sctp_chunk *chunk, gfp_t gfp) | |||
326 | 326 | ||
327 | sctp_chunk_hold(chunk); | 327 | sctp_chunk_hold(chunk); |
328 | sctp_outq_tail_data(q, chunk); | 328 | sctp_outq_tail_data(q, chunk); |
329 | if (chunk->asoc->prsctp_enable && | 329 | if (chunk->asoc->peer.prsctp_capable && |
330 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) | 330 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) |
331 | chunk->asoc->sent_cnt_removable++; | 331 | chunk->asoc->sent_cnt_removable++; |
332 | if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) | 332 | if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) |
@@ -383,7 +383,7 @@ static int sctp_prsctp_prune_sent(struct sctp_association *asoc, | |||
383 | 383 | ||
384 | list_for_each_entry_safe(chk, temp, queue, transmitted_list) { | 384 | list_for_each_entry_safe(chk, temp, queue, transmitted_list) { |
385 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || | 385 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || |
386 | chk->prsctp_param <= sinfo->sinfo_timetolive) | 386 | chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive) |
387 | continue; | 387 | continue; |
388 | 388 | ||
389 | list_del_init(&chk->transmitted_list); | 389 | list_del_init(&chk->transmitted_list); |
@@ -418,7 +418,7 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, | |||
418 | 418 | ||
419 | list_for_each_entry_safe(chk, temp, queue, list) { | 419 | list_for_each_entry_safe(chk, temp, queue, list) { |
420 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || | 420 | if (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || |
421 | chk->prsctp_param <= sinfo->sinfo_timetolive) | 421 | chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive) |
422 | continue; | 422 | continue; |
423 | 423 | ||
424 | list_del_init(&chk->list); | 424 | list_del_init(&chk->list); |
@@ -442,7 +442,7 @@ void sctp_prsctp_prune(struct sctp_association *asoc, | |||
442 | { | 442 | { |
443 | struct sctp_transport *transport; | 443 | struct sctp_transport *transport; |
444 | 444 | ||
445 | if (!asoc->prsctp_enable || !asoc->sent_cnt_removable) | 445 | if (!asoc->peer.prsctp_capable || !asoc->sent_cnt_removable) |
446 | return; | 446 | return; |
447 | 447 | ||
448 | msg_len = sctp_prsctp_prune_sent(asoc, sinfo, | 448 | msg_len = sctp_prsctp_prune_sent(asoc, sinfo, |
@@ -1055,7 +1055,7 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) | |||
1055 | 1055 | ||
1056 | /* Mark as failed send. */ | 1056 | /* Mark as failed send. */ |
1057 | sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM); | 1057 | sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM); |
1058 | if (asoc->prsctp_enable && | 1058 | if (asoc->peer.prsctp_capable && |
1059 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) | 1059 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) |
1060 | asoc->sent_cnt_removable--; | 1060 | asoc->sent_cnt_removable--; |
1061 | sctp_chunk_free(chunk); | 1061 | sctp_chunk_free(chunk); |
@@ -1347,7 +1347,7 @@ int sctp_outq_sack(struct sctp_outq *q, struct sctp_chunk *chunk) | |||
1347 | tsn = ntohl(tchunk->subh.data_hdr->tsn); | 1347 | tsn = ntohl(tchunk->subh.data_hdr->tsn); |
1348 | if (TSN_lte(tsn, ctsn)) { | 1348 | if (TSN_lte(tsn, ctsn)) { |
1349 | list_del_init(&tchunk->transmitted_list); | 1349 | list_del_init(&tchunk->transmitted_list); |
1350 | if (asoc->prsctp_enable && | 1350 | if (asoc->peer.prsctp_capable && |
1351 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) | 1351 | SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags)) |
1352 | asoc->sent_cnt_removable--; | 1352 | asoc->sent_cnt_removable--; |
1353 | sctp_chunk_free(tchunk); | 1353 | sctp_chunk_free(tchunk); |