diff for duplicates of <20120720161001.1cc1bb10@obelix.rh> diff --git a/a/1.txt b/N1/1.txt index dc41abf..d367eda 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -226,7 +226,7 @@ Neil Horman <nhorman@tuxdriver.com> wrote: > + * active state and set cwnd to 1, see SCTP > + * Quick failover draft section 5.1, point 5 > + */ -> + if (transport->state = SCTP_PF) { +> + if (transport->state == SCTP_PF) { > + ulp_notify = false; > + transport->cwnd = 1; > + } @@ -270,10 +270,10 @@ Neil Horman <nhorman@tuxdriver.com> wrote: > @@ -899,7 +921,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, > transports) { > -> if ((t->state = SCTP_INACTIVE) || -> - (t->state = SCTP_UNCONFIRMED)) -> + (t->state = SCTP_UNCONFIRMED) || -> + (t->state = SCTP_PF)) +> if ((t->state == SCTP_INACTIVE) || +> - (t->state == SCTP_UNCONFIRMED)) +> + (t->state == SCTP_UNCONFIRMED) || +> + (t->state == SCTP_PF)) > continue; > if (!first || t->last_time_heard > first->last_time_heard) { > second = first; @@ -284,22 +284,22 @@ Neil Horman <nhorman@tuxdriver.com> wrote: > @@ -792,7 +792,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) > if (!new_transport) > new_transport = asoc->peer.active_path; -> } else if ((new_transport->state = SCTP_INACTIVE) || -> - (new_transport->state = SCTP_UNCONFIRMED)) { -> + (new_transport->state = SCTP_UNCONFIRMED) || -> + (new_transport->state = SCTP_PF)) { +> } else if ((new_transport->state == SCTP_INACTIVE) || +> - (new_transport->state == SCTP_UNCONFIRMED)) { +> + (new_transport->state == SCTP_UNCONFIRMED) || +> + (new_transport->state == SCTP_PF)) { > /* If the chunk is Heartbeat or Heartbeat Ack, > * send it to chunk->transport, even if it's > * inactive. > @@ -987,7 +988,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) > new_transport = chunk->transport; > if (!new_transport || -> ((new_transport->state = SCTP_INACTIVE) || -> - (new_transport->state = SCTP_UNCONFIRMED))) -> + (new_transport->state = SCTP_UNCONFIRMED) || -> + (new_transport->state = SCTP_PF))) +> ((new_transport->state == SCTP_INACTIVE) || +> - (new_transport->state == SCTP_UNCONFIRMED))) +> + (new_transport->state == SCTP_UNCONFIRMED) || +> + (new_transport->state == SCTP_PF))) > new_transport = asoc->peer.active_path; -> if (new_transport->state = SCTP_UNCONFIRMED) +> if (new_transport->state == SCTP_UNCONFIRMED) > continue; > diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c > index c96d1a8..285e26a 100644 @@ -352,7 +352,7 @@ Neil Horman <nhorman@tuxdriver.com> wrote: > SCTP_HEARTBEAT_SUCCESS); > } > -> + if (t->state = SCTP_PF) +> + if (t->state == SCTP_PF) > + sctp_assoc_control_transport(asoc, t, SCTP_TRANSPORT_UP, > + SCTP_HEARTBEAT_SUCCESS); > + diff --git a/a/content_digest b/N1/content_digest index d133733..5338d20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01342810319-27457-1-git-send-email-nhorman@tuxdriver.com\0" "From\0Flavio Leitner <fbl@redhat.com>\0" "Subject\0Re: [PATCH v5] sctp: Implement quick failover draft from tsvwg\0" - "Date\0Fri, 20 Jul 2012 19:10:01 +0000\0" + "Date\0Fri, 20 Jul 2012 16:10:01 -0300\0" "To\0Neil Horman <nhorman@tuxdriver.com>\0" "Cc\0netdev@vger.kernel.org" Vlad Yasevich <vyasevich@gmail.com> @@ -240,7 +240,7 @@ "> +\t\t * active state and set cwnd to 1, see SCTP\n" "> +\t\t * Quick failover draft section 5.1, point 5\n" "> +\t\t */\n" - "> +\t\tif (transport->state = SCTP_PF) {\n" + "> +\t\tif (transport->state == SCTP_PF) {\n" "> +\t\t\tulp_notify = false;\n" "> +\t\t\ttransport->cwnd = 1;\n" "> +\t\t}\n" @@ -284,10 +284,10 @@ "> @@ -899,7 +921,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,\n" "> \t\t\ttransports) {\n" "> \n" - "> \t\tif ((t->state = SCTP_INACTIVE) ||\n" - "> -\t\t (t->state = SCTP_UNCONFIRMED))\n" - "> +\t\t (t->state = SCTP_UNCONFIRMED) ||\n" - "> +\t\t (t->state = SCTP_PF))\n" + "> \t\tif ((t->state == SCTP_INACTIVE) ||\n" + "> -\t\t (t->state == SCTP_UNCONFIRMED))\n" + "> +\t\t (t->state == SCTP_UNCONFIRMED) ||\n" + "> +\t\t (t->state == SCTP_PF))\n" "> \t\t\tcontinue;\n" "> \t\tif (!first || t->last_time_heard > first->last_time_heard) {\n" "> \t\t\tsecond = first;\n" @@ -298,22 +298,22 @@ "> @@ -792,7 +792,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)\n" "> \t\t\tif (!new_transport)\n" "> \t\t\t\tnew_transport = asoc->peer.active_path;\n" - "> \t\t} else if ((new_transport->state = SCTP_INACTIVE) ||\n" - "> -\t\t\t (new_transport->state = SCTP_UNCONFIRMED)) {\n" - "> +\t\t\t (new_transport->state = SCTP_UNCONFIRMED) ||\n" - "> +\t\t\t (new_transport->state = SCTP_PF)) {\n" + "> \t\t} else if ((new_transport->state == SCTP_INACTIVE) ||\n" + "> -\t\t\t (new_transport->state == SCTP_UNCONFIRMED)) {\n" + "> +\t\t\t (new_transport->state == SCTP_UNCONFIRMED) ||\n" + "> +\t\t\t (new_transport->state == SCTP_PF)) {\n" "> \t\t\t/* If the chunk is Heartbeat or Heartbeat Ack,\n" "> \t\t\t * send it to chunk->transport, even if it's\n" "> \t\t\t * inactive.\n" "> @@ -987,7 +988,8 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)\n" "> \t\t\tnew_transport = chunk->transport;\n" "> \t\t\tif (!new_transport ||\n" - "> \t\t\t ((new_transport->state = SCTP_INACTIVE) ||\n" - "> -\t\t\t (new_transport->state = SCTP_UNCONFIRMED)))\n" - "> +\t\t\t (new_transport->state = SCTP_UNCONFIRMED) ||\n" - "> +\t\t\t (new_transport->state = SCTP_PF)))\n" + "> \t\t\t ((new_transport->state == SCTP_INACTIVE) ||\n" + "> -\t\t\t (new_transport->state == SCTP_UNCONFIRMED)))\n" + "> +\t\t\t (new_transport->state == SCTP_UNCONFIRMED) ||\n" + "> +\t\t\t (new_transport->state == SCTP_PF)))\n" "> \t\t\t\tnew_transport = asoc->peer.active_path;\n" - "> \t\t\tif (new_transport->state = SCTP_UNCONFIRMED)\n" + "> \t\t\tif (new_transport->state == SCTP_UNCONFIRMED)\n" "> \t\t\t\tcontinue;\n" "> diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c\n" "> index c96d1a8..285e26a 100644\n" @@ -366,7 +366,7 @@ "> \t\t\t\t\t SCTP_HEARTBEAT_SUCCESS);\n" "> \t}\n" "> \n" - "> +\tif (t->state = SCTP_PF)\n" + "> +\tif (t->state == SCTP_PF)\n" "> +\t\tsctp_assoc_control_transport(asoc, t, SCTP_TRANSPORT_UP,\n" "> +\t\t\t\t\t SCTP_HEARTBEAT_SUCCESS);\n" "> +\n" @@ -573,4 +573,4 @@ "\n" fbl -104e5e537143182d9639eb12efcf5afac9876b4f5f7a5c2e8a617de50f259279 +5bd4dc3b383a2bc592a9e85525c63a519a468c942c8decf577f403010c1913fd
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.