diff for duplicates of <539873E2.3020003@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 71553a7..6dcc1ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,7 +64,7 @@ Not sure what you wanted to say here. > +{ > + if (trans1->error_count > trans2->error_count) { > + return trans2; -> + } else if (trans1->error_count = trans2->error_count && +> + } else if (trans1->error_count == trans2->error_count && > + ktime_after(trans2->last_time_heard, > + trans1->last_time_heard)) { > + return trans2; @@ -78,7 +78,7 @@ Not sure what you wanted to say here. > { > + u8 score_curr, score_best; > + -> if (best = NULL) +> if (best == NULL) > return curr; > > - return sctp_trans_score(curr) > sctp_trans_score(best) ? curr : best; @@ -91,7 +91,7 @@ Not sure what you wanted to say here. > + */ > + if (score_curr > score_best) > + return curr; -> + else if (score_curr = score_best) +> + else if (score_curr == score_best) > + return sctp_trans_elect_tie(curr, best); > + else > + return best; @@ -108,20 +108,20 @@ Not sure what you wanted to say here. > list_for_each_entry(trans, &asoc->peer.transport_addr_list, > transports) { > + /* Skip uninteresting transports. */ -> if (trans->state = SCTP_INACTIVE || -> - trans->state = SCTP_UNCONFIRMED || -> - trans->state = SCTP_PF) -> + trans->state = SCTP_UNCONFIRMED) +> if (trans->state == SCTP_INACTIVE || +> - trans->state == SCTP_UNCONFIRMED || +> - trans->state == SCTP_PF) +> + trans->state == SCTP_UNCONFIRMED) > continue; > + /* Keep track of the best PF transport from our > + * list in case we don't find an active one. > + */ -> + if (trans->state = SCTP_PF) { +> + if (trans->state == SCTP_PF) { > + trans_pf = sctp_trans_elect_best(trans, trans_pf); > + continue; > + } > + /* For active transports, pick the most recent ones. */ -> if (trans_pri = NULL || +> if (trans_pri == NULL || > ktime_after(trans->last_time_heard, > trans_pri->last_time_heard)) { > @@ -1317,10 +1354,13 @@ static void sctp_select_active_and_retran_path(struct sctp_association *asoc) @@ -132,7 +132,7 @@ Not sure what you wanted to say here. > + * primary or retran, even if they are inactive, if possible > + * pick a PF iff it's the better choice. > */ -> if (trans_pri = NULL) { +> if (trans_pri == NULL) { > - trans_pri = asoc->peer.primary_path; > + trans_pri = sctp_trans_elect_best(asoc->peer.primary_path, > + asoc->peer.retran_path); diff --git a/a/content_digest b/N1/content_digest index 3cd3ad2..aba729a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01402499003-29355-5-git-send-email-dborkman@redhat.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [PATCH v2 net-next 4/5] net: sctp: improve sctp_select_active_and_retran_path selection\0" - "Date\0Wed, 11 Jun 2014 15:21:06 +0000\0" + "Date\0Wed, 11 Jun 2014 11:21:06 -0400\0" "To\0Daniel Borkmann <dborkman@redhat.com>" " davem@davemloft.net\0" "Cc\0netdev@vger.kernel.org" @@ -75,7 +75,7 @@ "> +{\n" "> +\tif (trans1->error_count > trans2->error_count) {\n" "> +\t\treturn trans2;\n" - "> +\t} else if (trans1->error_count = trans2->error_count &&\n" + "> +\t} else if (trans1->error_count == trans2->error_count &&\n" "> +\t\t ktime_after(trans2->last_time_heard,\n" "> +\t\t\t trans1->last_time_heard)) {\n" "> +\t\treturn trans2;\n" @@ -89,7 +89,7 @@ "> {\n" "> +\tu8 score_curr, score_best;\n" "> +\n" - "> \tif (best = NULL)\n" + "> \tif (best == NULL)\n" "> \t\treturn curr;\n" "> \n" "> -\treturn sctp_trans_score(curr) > sctp_trans_score(best) ? curr : best;\n" @@ -102,7 +102,7 @@ "> +\t */\n" "> +\tif (score_curr > score_best)\n" "> +\t\treturn curr;\n" - "> +\telse if (score_curr = score_best)\n" + "> +\telse if (score_curr == score_best)\n" "> +\t\treturn sctp_trans_elect_tie(curr, best);\n" "> +\telse\n" "> +\t\treturn best;\n" @@ -119,20 +119,20 @@ "> \tlist_for_each_entry(trans, &asoc->peer.transport_addr_list,\n" "> \t\t\t transports) {\n" "> +\t\t/* Skip uninteresting transports. */\n" - "> \t\tif (trans->state = SCTP_INACTIVE ||\n" - "> -\t\t trans->state = SCTP_UNCONFIRMED ||\n" - "> -\t\t trans->state = SCTP_PF)\n" - "> +\t\t trans->state = SCTP_UNCONFIRMED)\n" + "> \t\tif (trans->state == SCTP_INACTIVE ||\n" + "> -\t\t trans->state == SCTP_UNCONFIRMED ||\n" + "> -\t\t trans->state == SCTP_PF)\n" + "> +\t\t trans->state == SCTP_UNCONFIRMED)\n" "> \t\t\tcontinue;\n" "> +\t\t/* Keep track of the best PF transport from our\n" "> +\t\t * list in case we don't find an active one.\n" "> +\t\t */\n" - "> +\t\tif (trans->state = SCTP_PF) {\n" + "> +\t\tif (trans->state == SCTP_PF) {\n" "> +\t\t\ttrans_pf = sctp_trans_elect_best(trans, trans_pf);\n" "> +\t\t\tcontinue;\n" "> +\t\t}\n" "> +\t\t/* For active transports, pick the most recent ones. */\n" - "> \t\tif (trans_pri = NULL ||\n" + "> \t\tif (trans_pri == NULL ||\n" "> \t\t ktime_after(trans->last_time_heard,\n" "> \t\t\t\ttrans_pri->last_time_heard)) {\n" "> @@ -1317,10 +1354,13 @@ static void sctp_select_active_and_retran_path(struct sctp_association *asoc)\n" @@ -143,7 +143,7 @@ "> +\t * primary or retran, even if they are inactive, if possible\n" "> +\t * pick a PF iff it's the better choice.\n" "> \t */\n" - "> \tif (trans_pri = NULL) {\n" + "> \tif (trans_pri == NULL) {\n" "> -\t\ttrans_pri = asoc->peer.primary_path;\n" "> +\t\ttrans_pri = sctp_trans_elect_best(asoc->peer.primary_path,\n" "> +\t\t\t\t\t\t asoc->peer.retran_path);\n" @@ -153,4 +153,4 @@ "> \n" > -d7fcfee6955927dca12ce8565ba8cd7ce23b11ae0e8616bf5dab80992ac3260f +50311fd9d5d20ea4172b477f7fc3d4c12d7479ce3c884d2a24f5cfa2836ed245
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.