diff for duplicates of <20171212133700.GD3532@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 2718933..a23e7e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,9 +9,9 @@ On Tue, Dec 12, 2017 at 09:31:36PM +0800, Xin Long wrote: > >> return &chunk_event_table[cid][state]; > >> > >> if (net->sctp.prsctp_enable) { -> >> - if (cid = SCTP_CID_FWD_TSN) -> >> + if (cid = SCTP_CID_FWD_TSN || -> >> + (net->sctp.intl_enable && cid = SCTP_CID_I_FWD_TSN)) +> >> - if (cid == SCTP_CID_FWD_TSN) +> >> + if (cid == SCTP_CID_FWD_TSN || +> >> + (net->sctp.intl_enable && cid == SCTP_CID_I_FWD_TSN)) > > > > We don't really need to check intl_enable here, do we? > We think net->sctp.xxx_enable as a main switch here, @@ -40,9 +40,9 @@ and discard later when trying to consume it. > > > > Because a) it should actually look like: -> > - if (cid = SCTP_CID_FWD_TSN) -> > + if ((!net->sctp.intl_enable && cid = SCTP_CID_FWD_TSN) || -> > + (net->sctp.intl_enable && cid = SCTP_CID_I_FWD_TSN)) +> > - if (cid == SCTP_CID_FWD_TSN) +> > + if ((!net->sctp.intl_enable && cid == SCTP_CID_FWD_TSN) || +> > + (net->sctp.intl_enable && cid == SCTP_CID_I_FWD_TSN)) > > but b) we will validate the chunk format/feature later with > > validate_ftsn(), similarly to what happens with data chunks, so it > > seems the check on intl_enable here is not necessary. diff --git a/a/content_digest b/N1/content_digest index 0e7ba2f..d52d4ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0CADvbK_d5ZqBtyuWYOJ19gwcd51g0Vgcdq-xCjevqwGpTgC-yDQ@mail.gmail.com\0" "From\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>\0" "Subject\0Re: [PATCH net-next 3/8] sctp: implement validate_ftsn for sctp_stream_interleave\0" - "Date\0Tue, 12 Dec 2017 13:37:00 +0000\0" + "Date\0Tue, 12 Dec 2017 11:37:00 -0200\0" "To\0Xin Long <lucien.xin@gmail.com>\0" "Cc\0network dev <netdev@vger.kernel.org>" linux-sctp@vger.kernel.org @@ -23,9 +23,9 @@ "> >> return &chunk_event_table[cid][state];\n" "> >>\n" "> >> if (net->sctp.prsctp_enable) {\n" - "> >> - if (cid = SCTP_CID_FWD_TSN)\n" - "> >> + if (cid = SCTP_CID_FWD_TSN ||\n" - "> >> + (net->sctp.intl_enable && cid = SCTP_CID_I_FWD_TSN))\n" + "> >> - if (cid == SCTP_CID_FWD_TSN)\n" + "> >> + if (cid == SCTP_CID_FWD_TSN ||\n" + "> >> + (net->sctp.intl_enable && cid == SCTP_CID_I_FWD_TSN))\n" "> >\n" "> > We don't really need to check intl_enable here, do we?\n" "> We think net->sctp.xxx_enable as a main switch here,\n" @@ -54,9 +54,9 @@ "> \n" "> \n" "> > Because a) it should actually look like:\n" - "> > - if (cid = SCTP_CID_FWD_TSN)\n" - "> > + if ((!net->sctp.intl_enable && cid = SCTP_CID_FWD_TSN) ||\n" - "> > + (net->sctp.intl_enable && cid = SCTP_CID_I_FWD_TSN))\n" + "> > - if (cid == SCTP_CID_FWD_TSN)\n" + "> > + if ((!net->sctp.intl_enable && cid == SCTP_CID_FWD_TSN) ||\n" + "> > + (net->sctp.intl_enable && cid == SCTP_CID_I_FWD_TSN))\n" "> > but b) we will validate the chunk format/feature later with\n" "> > validate_ftsn(), similarly to what happens with data chunks, so it\n" "> > seems the check on intl_enable here is not necessary.\n" @@ -155,4 +155,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -ddf7251b598ef2fc4d84a31132e9b5e6efd4984914e9b0602e5b68390778a48e +ecf42ff8ffc6c69e7441fd76bf42bd3508b76c7ddeb7fd78f7511f3f29ef1b36
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.