diff for duplicates of <4E146652.7010205@hp.com> diff --git a/a/1.txt b/N1/1.txt index de1fd53..d310b83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,7 @@ On 07/04/2011 09:50 AM, Thomas Graf wrote: > + * as the receiver acknowledged any data. > + */ > + t = &asoc->timers[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]; -> + if (asoc->state = SCTP_STATE_SHUTDOWN_PENDING && +> + if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING && > + timer_pending(t) && del_timer(t)) > + sctp_association_put(asoc); > + @@ -53,8 +53,8 @@ a little by checking the state prior to referencing timers array. > */ > if (!q->asoc->peer.rwnd && > !list_empty(&tlist) && -> - (sack_ctsn+2 = q->asoc->next_tsn)) { -> + (sack_ctsn+2 = q->asoc->next_tsn) && +> - (sack_ctsn+2 == q->asoc->next_tsn)) { +> + (sack_ctsn+2 == q->asoc->next_tsn) && > + !(q->asoc->state >= SCTP_STATE_SHUTDOWN_PENDING)) { Would a test for (q->asoc->state != SCTP_STATE_SHUTDOWN_PENDING) be clearer? We only @@ -120,7 +120,7 @@ the code. > - SCTP_INC_STATS(SCTP_MIB_ABORTEDS); > - SCTP_DEC_STATS(SCTP_MIB_CURRESTAB); > - return SCTP_DISPOSITION_DELETE_TCB; -> + if (asoc->state = SCTP_STATE_SHUTDOWN_PENDING) { +> + if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) { > + /* > + * We are here likely because the receiver had its rwnd > + * closed for a while and we have not been able to diff --git a/a/content_digest b/N1/content_digest index 233ae87..f0d9934 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,7 +9,7 @@ "ref\020110704135019.GA801@canuck.infradead.org\0" "From\0Vladislav Yasevich <vladislav.yasevich@hp.com>\0" "Subject\0Re: [PATCHv2] sctp: Enforce retransmission limit during shutdown\0" - "Date\0Wed, 06 Jul 2011 13:42:42 +0000\0" + "Date\0Wed, 06 Jul 2011 09:42:42 -0400\0" "To\0netdev@vger.kernel.org" davem@davemloft.net Wei Yongjun <yjwei@cn.fujitsu.com> @@ -50,7 +50,7 @@ "> +\t\t\t * as the receiver acknowledged any data.\n" "> +\t\t\t */\n" "> +\t\t\tt = &asoc->timers[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD];\n" - "> +\t\t\tif (asoc->state = SCTP_STATE_SHUTDOWN_PENDING &&\n" + "> +\t\t\tif (asoc->state == SCTP_STATE_SHUTDOWN_PENDING &&\n" "> +\t\t\t timer_pending(t) && del_timer(t))\n" "> +\t\t\t\tsctp_association_put(asoc);\n" "> +\n" @@ -72,8 +72,8 @@ "> \t\t\t */\n" "> \t\t\tif (!q->asoc->peer.rwnd &&\n" "> \t\t\t !list_empty(&tlist) &&\n" - "> -\t\t\t (sack_ctsn+2 = q->asoc->next_tsn)) {\n" - "> +\t\t\t (sack_ctsn+2 = q->asoc->next_tsn) &&\n" + "> -\t\t\t (sack_ctsn+2 == q->asoc->next_tsn)) {\n" + "> +\t\t\t (sack_ctsn+2 == q->asoc->next_tsn) &&\n" "> +\t\t\t !(q->asoc->state >= SCTP_STATE_SHUTDOWN_PENDING)) {\n" "\n" "Would a test for (q->asoc->state != SCTP_STATE_SHUTDOWN_PENDING) be clearer? We only\n" @@ -139,7 +139,7 @@ "> -\t\tSCTP_INC_STATS(SCTP_MIB_ABORTEDS);\n" "> -\t\tSCTP_DEC_STATS(SCTP_MIB_CURRESTAB);\n" "> -\t\treturn SCTP_DISPOSITION_DELETE_TCB;\n" - "> +\t\tif (asoc->state = SCTP_STATE_SHUTDOWN_PENDING) {\n" + "> +\t\tif (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) {\n" "> +\t\t\t/*\n" "> +\t\t\t * We are here likely because the receiver had its rwnd\n" "> +\t\t\t * closed for a while and we have not been able to\n" @@ -188,4 +188,4 @@ "> \t/* SCTP_STATE_SHUTDOWN_RECEIVED */ \\\n" > -a43aef48a46c730559503985e5a161c5b983e896d1e1deaac772dadb2a93e86a +b2e1acbff500f2a6103c7d487632af4b42a5a44939f16b08a54af4aff856f073
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.