diff for duplicates of <50BCD956.2090706@gmail.com> diff --git a/a/1.txt b/N1/1.txt index da2771a..c233980 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -209,7 +209,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + else { > SCTP_INC_STATS(net, SCTP_MIB_INCTRLCHUNKS); > + asoc->stats.ictrlchunks++; -> + if (chunk->chunk_hdr->type = SCTP_CID_SACK) +> + if (chunk->chunk_hdr->type == SCTP_CID_SACK) > + asoc->stats.isacks++; > + } > @@ -293,7 +293,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > if (status != SCTP_XMIT_OK) { > /* put the chunk back */ > list_add(&chunk->list, &q->control_chunk_list); -> - } else if (chunk->chunk_hdr->type = SCTP_CID_FWD_TSN) { +> - } else if (chunk->chunk_hdr->type == SCTP_CID_FWD_TSN) { > + } else { > + asoc->stats.octrlchunks++; > /* PR-SCTP C5) If a FORWARD TSN is sent, the @@ -301,14 +301,14 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > * timer is running. > */ > - sctp_transport_reset_timers(transport); -> + if (chunk->chunk_hdr->type = SCTP_CID_FWD_TSN) +> + if (chunk->chunk_hdr->type == SCTP_CID_FWD_TSN) > + sctp_transport_reset_timers(transport); > } > break; > > @@ -1055,6 +1058,10 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout) > */ -> if (asoc->state = SCTP_STATE_SHUTDOWN_PENDING) +> if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) > chunk->chunk_hdr->flags |= SCTP_DATA_SACK_IMM; > + if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) > + asoc->stats.ouodchunks++; diff --git a/a/content_digest b/N1/content_digest index 49de5ab..62d6191 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01354373382-15230-1-git-send-email-michele@acksyn.org\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" - "Subject\0Re: [PATCH v4 net-next] sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STA\0" - "Date\0Mon, 03 Dec 2012 16:54:46 +0000\0" + "Subject\0Re: [PATCH v4 net-next] sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STATS call\0" + "Date\0Mon, 03 Dec 2012 11:54:46 -0500\0" "To\0Michele Baldessari <michele@acksyn.org>\0" "Cc\0linux-sctp@vger.kernel.org" Neil Horman <nhorman@tuxdriver.com> @@ -221,7 +221,7 @@ "> +\t\telse {\n" "> \t\t\tSCTP_INC_STATS(net, SCTP_MIB_INCTRLCHUNKS);\n" "> +\t\t\tasoc->stats.ictrlchunks++;\n" - "> +\t\t\tif (chunk->chunk_hdr->type = SCTP_CID_SACK)\n" + "> +\t\t\tif (chunk->chunk_hdr->type == SCTP_CID_SACK)\n" "> +\t\t\t\tasoc->stats.isacks++;\n" "> +\t\t}\n" ">\n" @@ -305,7 +305,7 @@ "> \t\t\tif (status != SCTP_XMIT_OK) {\n" "> \t\t\t\t/* put the chunk back */\n" "> \t\t\t\tlist_add(&chunk->list, &q->control_chunk_list);\n" - "> -\t\t\t} else if (chunk->chunk_hdr->type = SCTP_CID_FWD_TSN) {\n" + "> -\t\t\t} else if (chunk->chunk_hdr->type == SCTP_CID_FWD_TSN) {\n" "> +\t\t\t} else {\n" "> +\t\t\t\tasoc->stats.octrlchunks++;\n" "> \t\t\t\t/* PR-SCTP C5) If a FORWARD TSN is sent, the\n" @@ -313,14 +313,14 @@ "> \t\t\t\t * timer is running.\n" "> \t\t\t\t */\n" "> -\t\t\t\tsctp_transport_reset_timers(transport);\n" - "> +\t\t\t\tif (chunk->chunk_hdr->type = SCTP_CID_FWD_TSN)\n" + "> +\t\t\t\tif (chunk->chunk_hdr->type == SCTP_CID_FWD_TSN)\n" "> +\t\t\t\t\tsctp_transport_reset_timers(transport);\n" "> \t\t\t}\n" "> \t\t\tbreak;\n" ">\n" "> @@ -1055,6 +1058,10 @@ static int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)\n" "> \t\t\t\t */\n" - "> \t\t\t\tif (asoc->state = SCTP_STATE_SHUTDOWN_PENDING)\n" + "> \t\t\t\tif (asoc->state == SCTP_STATE_SHUTDOWN_PENDING)\n" "> \t\t\t\t\tchunk->chunk_hdr->flags |= SCTP_DATA_SACK_IMM;\n" "> +\t\t\t\tif (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED)\n" "> +\t\t\t\t\tasoc->stats.ouodchunks++;\n" @@ -513,4 +513,4 @@ "> \tt->rttvar = 0;\n" > -c9cf872be09648401140de0d77753ec50ff803c6fb20c20599c6ba3023eeecf8 +04c394b3290284ca623beae9c7c39ff17d410b43b130e4c9ff0003e8c7c5ba85
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.