diff for duplicates of <4FEE0DDF.60604@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 9306898..02871c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -138,7 +138,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > if (timer_pending(timer)) { > struct sctp_chunk *sack; > + -> + if (pkt->transport->sack_generation !> + pkt->transport->asoc->peer.sack_generation) +> + if (pkt->transport->sack_generation != +> + pkt->transport->asoc->peer.sack_generation) > + return retval; > + > asoc->a_rwnd = asoc->rwnd; @@ -172,7 +173,7 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > + * association so no transport will match after a wrap event like this, > + * Until the next sack > + */ -> + if (++aptr->peer.sack_generation = 0) { +> + if (++aptr->peer.sack_generation == 0) { > + list_for_each_entry(trans,&asoc->peer.transport_addr_list, > + transports) > + trans->sack_generation = 0; @@ -226,7 +227,8 @@ Acked-by: Vlad Yasevich <vyasevich@gmail.com> > map->max_tsn_seen++; > map->cumulative_tsn_ack_point++; > + if (trans) -> + trans->sack_generation > + trans->asoc->peer.sack_generation; +> + trans->sack_generation = +> + trans->asoc->peer.sack_generation; > map->base_tsn++; > } else { > /* Either we already have a gap, or about to record a gap, so diff --git a/a/content_digest b/N1/content_digest index d85283f..93b5b41 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01341000929-22933-1-git-send-email-nhorman@tuxdriver.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH v5] sctp: be more restrictive in transport selection on bundled sacks\0" - "Date\0Fri, 29 Jun 2012 20:19:43 +0000\0" + "Date\0Fri, 29 Jun 2012 16:19:43 -0400\0" "To\0Neil Horman <nhorman@tuxdriver.com>\0" "Cc\0netdev@vger.kernel.org" David S. Miller <davem@davemloft.net> @@ -149,7 +149,8 @@ "> \t\tif (timer_pending(timer)) {\n" "> \t\t\tstruct sctp_chunk *sack;\n" "> +\n" - "> +\t\t\tif (pkt->transport->sack_generation !> +\t\t\t pkt->transport->asoc->peer.sack_generation)\n" + "> +\t\t\tif (pkt->transport->sack_generation !=\n" + "> +\t\t\t pkt->transport->asoc->peer.sack_generation)\n" "> +\t\t\t\treturn retval;\n" "> +\n" "> \t\t\tasoc->a_rwnd = asoc->rwnd;\n" @@ -183,7 +184,7 @@ "> +\t * association so no transport will match after a wrap event like this,\n" "> +\t * Until the next sack\n" "> +\t */\n" - "> +\tif (++aptr->peer.sack_generation = 0) {\n" + "> +\tif (++aptr->peer.sack_generation == 0) {\n" "> +\t\tlist_for_each_entry(trans,&asoc->peer.transport_addr_list,\n" "> +\t\t\t\t transports)\n" "> +\t\t\ttrans->sack_generation = 0;\n" @@ -237,7 +238,8 @@ "> \t\tmap->max_tsn_seen++;\n" "> \t\tmap->cumulative_tsn_ack_point++;\n" "> +\t\tif (trans)\n" - "> +\t\t\ttrans->sack_generation > +\t\t\t\ttrans->asoc->peer.sack_generation;\n" + "> +\t\t\ttrans->sack_generation =\n" + "> +\t\t\t\ttrans->asoc->peer.sack_generation;\n" "> \t\tmap->base_tsn++;\n" "> \t} else {\n" "> \t\t/* Either we already have a gap, or about to record a gap, so\n" @@ -269,4 +271,4 @@ ">\n" "> \t\tsctp_ulpq_partial_delivery(ulpq, chunk, gfp);" -18972c828a7cbae3944f490a357e512dc074cdee9899bdb0a31e1a385ae30cd5 +f6d21690fd475a7c78ab7b563467e111b0e44bdaee999b34d3b0f3a013b6f7fc
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.