diff for duplicates of <4E15B65A.3010209@hp.com> diff --git a/a/1.txt b/N1/1.txt index 1b5f851..5328411 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -77,7 +77,7 @@ Thanks > + * retransmission limit. Stop that timer as soon > + * as the receiver acknowledged any data. > + */ -> + if (asoc->state = SCTP_STATE_SHUTDOWN_PENDING && +> + if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING && > + del_timer(&asoc->timers > + [SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD])) > + sctp_association_put(asoc); @@ -96,8 +96,8 @@ Thanks > */ > 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) { > SCTP_DEBUG_PRINTK("%s: SACK received for zero " > "window probe: %u\n", @@ -167,7 +167,7 @@ Thanks > - 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 356e71f..c20a7bf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,7 +11,7 @@ "ref\020110707102835.GA6277@canuck.infradead.org\0" "From\0Vladislav Yasevich <vladislav.yasevich@hp.com>\0" "Subject\0Re: [PATCHv3] sctp: Enforce retransmission limit during shutdown\0" - "Date\0Thu, 07 Jul 2011 13:36:26 +0000\0" + "Date\0Thu, 07 Jul 2011 09:36:26 -0400\0" "To\0netdev@vger.kernel.org" davem@davemloft.net Wei Yongjun <yjwei@cn.fujitsu.com> @@ -98,7 +98,7 @@ "> +\t\t\t * retransmission limit. Stop that timer as soon\n" "> +\t\t\t * as the receiver acknowledged any data.\n" "> +\t\t\t */\n" - "> +\t\t\tif (asoc->state = SCTP_STATE_SHUTDOWN_PENDING &&\n" + "> +\t\t\tif (asoc->state == SCTP_STATE_SHUTDOWN_PENDING &&\n" "> +\t\t\t del_timer(&asoc->timers\n" "> +\t\t\t\t[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]))\n" "> +\t\t\t\t\tsctp_association_put(asoc);\n" @@ -117,8 +117,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" "> \t\t\t\tSCTP_DEBUG_PRINTK(\"%s: SACK received for zero \"\n" "> \t\t\t\t\t\t \"window probe: %u\\n\",\n" @@ -188,7 +188,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" @@ -228,4 +228,4 @@ "> \t/* SCTP_STATE_SHUTDOWN_RECEIVED */ \\\n" > -ced87e4679bda719f5b8952d936b7c372bb55e2613cb285b57d28f6e5a6ae3b3 +b974a8c6ce66ae79d65cdb6743a379852c646ff94e8d3032cd1a12066d756cc6
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.