diff for duplicates of <20170331180813.GC5879@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index c5f9c45..b22fdcf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,7 +51,8 @@ On Fri, Mar 31, 2017 at 06:14:09PM +0800, Xin Long wrote: > if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) && > time_after(jiffies, chunk->msg->expires_at)) { > - if (chunk->sent_count) -> + struct sctp_stream_out *streamout > + &chunk->asoc->stream->out[chunk->sinfo.sinfo_stream]; +> + struct sctp_stream_out *streamout = +> + &chunk->asoc->stream->out[chunk->sinfo.sinfo_stream]; > + > + if (chunk->sent_count) { > chunk->asoc->abandoned_sent[SCTP_PR_INDEX(TTL)]++; @@ -64,7 +65,8 @@ On Fri, Mar 31, 2017 at 06:14:09PM +0800, Xin Long wrote: > return 1; > } else if (SCTP_PR_RTX_ENABLED(chunk->sinfo.sinfo_flags) && > chunk->sent_count > chunk->sinfo.sinfo_timetolive) { -> + struct sctp_stream_out *streamout > + &chunk->asoc->stream->out[chunk->sinfo.sinfo_stream]; +> + struct sctp_stream_out *streamout = +> + &chunk->asoc->stream->out[chunk->sinfo.sinfo_stream]; > + > chunk->asoc->abandoned_sent[SCTP_PR_INDEX(RTX)]++; > + streamout->abandoned_sent[SCTP_PR_INDEX(RTX)]++; @@ -100,7 +102,8 @@ On Fri, Mar 31, 2017 at 06:14:09PM +0800, Xin Long wrote: > asoc->sent_cnt_removable--; > asoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++; > + if (chk->sinfo.sinfo_stream < asoc->stream->outcnt) { -> + struct sctp_stream_out *streamout > + &asoc->stream->out[chk->sinfo.sinfo_stream]; +> + struct sctp_stream_out *streamout = +> + &asoc->stream->out[chk->sinfo.sinfo_stream]; > + > + streamout->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++; > + } @@ -147,16 +150,20 @@ otherwise it lgtm > + goto out; > + > + streamout = &asoc->stream->out[params.sprstat_sid]; -> + if (policy = SCTP_PR_SCTP_NONE) { +> + if (policy == SCTP_PR_SCTP_NONE) { > + params.sprstat_abandoned_unsent = 0; > + params.sprstat_abandoned_sent = 0; > + for (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) { -> + params.sprstat_abandoned_unsent +> + streamout->abandoned_unsent[policy]; -> + params.sprstat_abandoned_sent +> + streamout->abandoned_sent[policy]; +> + params.sprstat_abandoned_unsent += +> + streamout->abandoned_unsent[policy]; +> + params.sprstat_abandoned_sent += +> + streamout->abandoned_sent[policy]; > + } > + } else { -> + params.sprstat_abandoned_unsent > + streamout->abandoned_unsent[__SCTP_PR_INDEX(policy)]; -> + params.sprstat_abandoned_sent > + streamout->abandoned_sent[__SCTP_PR_INDEX(policy)]; +> + params.sprstat_abandoned_unsent = +> + streamout->abandoned_unsent[__SCTP_PR_INDEX(policy)]; +> + params.sprstat_abandoned_sent = +> + streamout->abandoned_sent[__SCTP_PR_INDEX(policy)]; > + } > + > + if (put_user(len, optlen) || copy_to_user(optval, ¶ms, len)) { diff --git a/a/content_digest b/N1/content_digest index 5bb548b..824f869 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0683bd49225abe18aa3cbd285bacb6a514a2d06b2.1490955249.git.lucien.xin@gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net-next] sctp: add SCTP_PR_STREAM_STATUS sockopt for prsctp\0" - "Date\0Fri, 31 Mar 2017 18:08:13 +0000\0" + "Date\0Fri, 31 Mar 2017 15:08:13 -0300\0" "To\0Xin Long <lucien.xin@gmail.com>\0" "Cc\0network dev <netdev@vger.kernel.org>" linux-sctp@vger.kernel.org @@ -62,7 +62,8 @@ "> \tif (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) &&\n" "> \t time_after(jiffies, chunk->msg->expires_at)) {\n" "> -\t\tif (chunk->sent_count)\n" - "> +\t\tstruct sctp_stream_out *streamout > +\t\t\t&chunk->asoc->stream->out[chunk->sinfo.sinfo_stream];\n" + "> +\t\tstruct sctp_stream_out *streamout =\n" + "> +\t\t\t&chunk->asoc->stream->out[chunk->sinfo.sinfo_stream];\n" "> +\n" "> +\t\tif (chunk->sent_count) {\n" "> \t\t\tchunk->asoc->abandoned_sent[SCTP_PR_INDEX(TTL)]++;\n" @@ -75,7 +76,8 @@ "> \t\treturn 1;\n" "> \t} else if (SCTP_PR_RTX_ENABLED(chunk->sinfo.sinfo_flags) &&\n" "> \t\t chunk->sent_count > chunk->sinfo.sinfo_timetolive) {\n" - "> +\t\tstruct sctp_stream_out *streamout > +\t\t\t&chunk->asoc->stream->out[chunk->sinfo.sinfo_stream];\n" + "> +\t\tstruct sctp_stream_out *streamout =\n" + "> +\t\t\t&chunk->asoc->stream->out[chunk->sinfo.sinfo_stream];\n" "> +\n" "> \t\tchunk->asoc->abandoned_sent[SCTP_PR_INDEX(RTX)]++;\n" "> +\t\tstreamout->abandoned_sent[SCTP_PR_INDEX(RTX)]++;\n" @@ -111,7 +113,8 @@ "> \t\tasoc->sent_cnt_removable--;\n" "> \t\tasoc->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;\n" "> +\t\tif (chk->sinfo.sinfo_stream < asoc->stream->outcnt) {\n" - "> +\t\t\tstruct sctp_stream_out *streamout > +\t\t\t\t&asoc->stream->out[chk->sinfo.sinfo_stream];\n" + "> +\t\t\tstruct sctp_stream_out *streamout =\n" + "> +\t\t\t\t&asoc->stream->out[chk->sinfo.sinfo_stream];\n" "> +\n" "> +\t\t\tstreamout->abandoned_unsent[SCTP_PR_INDEX(PRIO)]++;\n" "> +\t\t}\n" @@ -158,16 +161,20 @@ "> +\t\tgoto out;\n" "> +\n" "> +\tstreamout = &asoc->stream->out[params.sprstat_sid];\n" - "> +\tif (policy = SCTP_PR_SCTP_NONE) {\n" + "> +\tif (policy == SCTP_PR_SCTP_NONE) {\n" "> +\t\tparams.sprstat_abandoned_unsent = 0;\n" "> +\t\tparams.sprstat_abandoned_sent = 0;\n" "> +\t\tfor (policy = 0; policy <= SCTP_PR_INDEX(MAX); policy++) {\n" - "> +\t\t\tparams.sprstat_abandoned_unsent +> +\t\t\t\tstreamout->abandoned_unsent[policy];\n" - "> +\t\t\tparams.sprstat_abandoned_sent +> +\t\t\t\tstreamout->abandoned_sent[policy];\n" + "> +\t\t\tparams.sprstat_abandoned_unsent +=\n" + "> +\t\t\t\tstreamout->abandoned_unsent[policy];\n" + "> +\t\t\tparams.sprstat_abandoned_sent +=\n" + "> +\t\t\t\tstreamout->abandoned_sent[policy];\n" "> +\t\t}\n" "> +\t} else {\n" - "> +\t\tparams.sprstat_abandoned_unsent > +\t\t\tstreamout->abandoned_unsent[__SCTP_PR_INDEX(policy)];\n" - "> +\t\tparams.sprstat_abandoned_sent > +\t\t\tstreamout->abandoned_sent[__SCTP_PR_INDEX(policy)];\n" + "> +\t\tparams.sprstat_abandoned_unsent =\n" + "> +\t\t\tstreamout->abandoned_unsent[__SCTP_PR_INDEX(policy)];\n" + "> +\t\tparams.sprstat_abandoned_sent =\n" + "> +\t\t\tstreamout->abandoned_sent[__SCTP_PR_INDEX(policy)];\n" "> +\t}\n" "> +\n" "> +\tif (put_user(len, optlen) || copy_to_user(optval, ¶ms, len)) {\n" @@ -204,4 +211,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -4a1ff782204e6c2ce5235fa391930786d5eff0082a075d276b02db58035bafae +37c365330b1810ee5c5ceab57b111fbf6710c3d4ae08c1b48b5af63c0bb97574
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.