diff for duplicates of <489B49B5.7090708@hp.com> diff --git a/a/1.txt b/N1/1.txt index 6cefa18..e1e7a71 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -96,9 +96,9 @@ retransmitted. > @@ -418,7 +418,7 @@ void sctp_retransmit_mark(struct sctp_outq *q, > * be added to the retransmit queue. > */ -> if ((reason = SCTP_RTXR_FAST_RTX && +> if ((reason == SCTP_RTXR_FAST_RTX && > - (chunk->fast_retransmit > 0)) || -> + (chunk->fast_retransmit = SCTP_NEED_FRTX)) || +> + (chunk->fast_retransmit == SCTP_NEED_FRTX)) || > (reason != SCTP_RTXR_FAST_RTX && !chunk->tsn_gap_acked)) { > /* If this chunk was sent less then 1 rto ago, do not > * retransmit this chunk, but give the peer time @@ -108,7 +108,7 @@ retransmitted. > */ > - if (chunk->fast_retransmit > 0) > - chunk->fast_retransmit = -1; -> + if (chunk->fast_retransmit = SCTP_NEED_FRTX) +> + if (chunk->fast_retransmit == SCTP_NEED_FRTX) > + chunk->fast_retransmit = SCTP_DONT_FRTX; > > /* Force start T3-rtx timer when fast retransmitting @@ -119,7 +119,7 @@ retransmitted. > list_for_each_entry(chunk1, lqueue, transmitted_list) { > - if (chunk1->fast_retransmit > 0) > - chunk1->fast_retransmit = -1; -> + if (chunk1->fast_retransmit = SCTP_NEED_FRTX) +> + if (chunk1->fast_retransmit == SCTP_NEED_FRTX) > + chunk1->fast_retransmit = SCTP_DONT_FRTX; > } > } @@ -129,9 +129,9 @@ retransmitted. > * fast retransmit already. > */ > - if (!chunk->fast_retransmit && -> + if (!(chunk->fast_retransmit = SCTP_NEED_FRTX) && +> + if (!(chunk->fast_retransmit == SCTP_NEED_FRTX) && -if (chunk->fast_retransmit = SCTP_CAN_FRTX && +if (chunk->fast_retransmit == SCTP_CAN_FRTX && That's what the test should be doing. I've already done the changes in my tree, so this is just fyi so that your environment is fixed. diff --git a/a/content_digest b/N1/content_digest index 36edab6..dd59393 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020080725164409.GD12725@hmsreliant.think-freely.org\0" "From\0Vlad Yasevich <vladislav.yasevich@hp.com>\0" "Subject\0Re: [PATCH] sctp: reduce memory footprint of sctp_chunk structure\0" - "Date\0Thu, 07 Aug 2008 19:15:01 +0000\0" + "Date\0Thu, 07 Aug 2008 15:15:01 -0400\0" "To\0Neil Horman <nhorman@tuxdriver.com>\0" "Cc\0linux-sctp@vger.kernel.org" " netdev@vger.kernel.org\0" @@ -107,9 +107,9 @@ "> @@ -418,7 +418,7 @@ void sctp_retransmit_mark(struct sctp_outq *q,\n" "> \t\t * be added to the retransmit queue.\n" "> \t\t */\n" - "> \t\tif ((reason = SCTP_RTXR_FAST_RTX &&\n" + "> \t\tif ((reason == SCTP_RTXR_FAST_RTX &&\n" "> -\t\t\t (chunk->fast_retransmit > 0)) ||\n" - "> +\t\t\t (chunk->fast_retransmit = SCTP_NEED_FRTX)) ||\n" + "> +\t\t\t (chunk->fast_retransmit == SCTP_NEED_FRTX)) ||\n" "> \t\t (reason != SCTP_RTXR_FAST_RTX && !chunk->tsn_gap_acked)) {\n" "> \t\t\t/* If this chunk was sent less then 1 rto ago, do not\n" "> \t\t\t * retransmit this chunk, but give the peer time\n" @@ -119,7 +119,7 @@ "> \t\t\t */\n" "> -\t\t\tif (chunk->fast_retransmit > 0)\n" "> -\t\t\t\tchunk->fast_retransmit = -1;\n" - "> +\t\t\tif (chunk->fast_retransmit = SCTP_NEED_FRTX)\n" + "> +\t\t\tif (chunk->fast_retransmit == SCTP_NEED_FRTX)\n" "> +\t\t\t\tchunk->fast_retransmit = SCTP_DONT_FRTX;\n" "> \n" "> \t\t\t/* Force start T3-rtx timer when fast retransmitting\n" @@ -130,7 +130,7 @@ "> \t\tlist_for_each_entry(chunk1, lqueue, transmitted_list) {\n" "> -\t\t\tif (chunk1->fast_retransmit > 0)\n" "> -\t\t\t\tchunk1->fast_retransmit = -1;\n" - "> +\t\t\tif (chunk1->fast_retransmit = SCTP_NEED_FRTX)\n" + "> +\t\t\tif (chunk1->fast_retransmit == SCTP_NEED_FRTX)\n" "> +\t\t\t\tchunk1->fast_retransmit = SCTP_DONT_FRTX;\n" "> \t\t}\n" "> \t}\n" @@ -140,9 +140,9 @@ "> \t\t * fast retransmit already.\n" "> \t\t */\n" "> -\t\tif (!chunk->fast_retransmit &&\n" - "> +\t\tif (!(chunk->fast_retransmit = SCTP_NEED_FRTX) &&\n" + "> +\t\tif (!(chunk->fast_retransmit == SCTP_NEED_FRTX) &&\n" "\n" - "if (chunk->fast_retransmit = SCTP_CAN_FRTX &&\n" + "if (chunk->fast_retransmit == SCTP_CAN_FRTX &&\n" "\n" "That's what the test should be doing. I've already done the changes\n" "in my tree, so this is just fyi so that your environment is fixed.\n" @@ -179,4 +179,4 @@ "> \t * of the message (for SEND_FAILED).\n" > -0e990e65c4951d8084c8421e02e64a64e1cdb7cb9d4fa7d4b528dba20e7c692c +0dbc33171fad387d3fde44cad0de81845070e8ce33ef71ddb51530e8ad140d17
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.