diff for duplicates of <48BCDE89.7060909@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index eb84dbc..5f3e6cb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Gerrit Renker дµÀ: +Gerrit Renker 写道: > This patch provides the post-processing of feature negotiation state, after > the negotiation has completed. > @@ -46,7 +46,7 @@ Gerrit Renker дµÀ: > + struct dccp_sock *dp = dccp_sk(sk); > + struct ccid *new_ccid = ccid_new(ccid, sk, rx, gfp_any()); > + -> + if (new_ccid = NULL) +> + if (new_ccid == NULL) > + return -ENOMEM; > + > + if (rx) { @@ -80,9 +80,9 @@ Gerrit Renker дµÀ: > + struct dccp_sock *dp = dccp_sk(sk); > + > + if (rx) { -> + if (enable && dp->dccps_hc_rx_ackvec = NULL) { +> + if (enable && dp->dccps_hc_rx_ackvec == NULL) { > + dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(gfp_any()); -> + if (dp->dccps_hc_rx_ackvec = NULL) +> + if (dp->dccps_hc_rx_ackvec == NULL) > + return -ENOMEM; > + } else if (!enable) { > + dccp_ackvec_free(dp->dccps_hc_rx_ackvec); @@ -115,7 +115,7 @@ Gerrit Renker дµÀ: > + if (rx) > + dp->dccps_pcrlen = cscov; > + else { -> + if (dp->dccps_pcslen = 0) +> + if (dp->dccps_pcslen == 0) > + dp->dccps_pcslen = cscov; > + else if (cscov > dp->dccps_pcslen) > + DCCP_WARN("CsCov %u too small, peer requires >= %u\n", @@ -172,13 +172,13 @@ Gerrit Renker дµÀ: > + > + if (idx < 0 || idx >= DCCP_FEAT_SUPPORTED_MAX) > + return -1; -> + if (dccp_feat_table[idx].activation_hdlr = NULL) +> + if (dccp_feat_table[idx].activation_hdlr == NULL) > + return 0; > + -> + if (fval = NULL) { +> + if (fval == NULL) { > + val = dccp_feat_table[idx].default_value; -> + } else if (dccp_feat_table[idx].reconciliation = FEAT_SP) { -> + if (fval->sp.vec = NULL) { +> + } else if (dccp_feat_table[idx].reconciliation == FEAT_SP) { +> + if (fval->sp.vec == NULL) { > + /* > + * This can happen when an empty Confirm is sent > + * for an SP (i.e. known) feature. In this case @@ -194,7 +194,7 @@ Gerrit Renker дµÀ: > + } > + > + /* Location is RX if this is a local-RX or remote-TX feature */ -> + rx = (is_local = (dccp_feat_table[idx].rxtx = FEAT_AT_RX)); +> + rx = (is_local == (dccp_feat_table[idx].rxtx == FEAT_AT_RX)); > + > + return dccp_feat_table[idx].activation_hdlr(sk, val, rx); > +} diff --git a/a/content_digest b/N1/content_digest index d9e3dd2..c772599 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,29 @@ + "ref\0dccp_featneg_last_call_for_comments\0" + "ref\01219945512-7723-11-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-12-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-13-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-14-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-15-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-16-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-17-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-18-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-19-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-20-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-21-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-22-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-23-git-send-email-gerrit@erg.abdn.ac. uk\0" + "ref\01219945512-7723-24-git-send-email-gerrit@erg.abdn.ac.uk\0" + "ref\01219945512-7723-25-git-send-email-gerrit@erg.abdn.ac.uk\0" "ref\01219945512-7723-26-git-send-email-gerrit@erg.abdn.ac.uk\0" "From\0Wei Yongjun <yjwei@cn.fujitsu.com>\0" "Subject\0Re: [PATCH 25/37] dccp: Feature activation handlers\0" - "Date\0Tue, 02 Sep 2008 06:34:49 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Tue, 02 Sep 2008 14:34:49 +0800\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" + "Cc\0dccp@vger.kernel.org" + " netdev@vger.kernel.org\0" "\00:1\0" "b\0" - "Gerrit Renker \303\220\302\264\302\265\303\200:\n" + "Gerrit Renker \345\206\231\351\201\223:\n" "> This patch provides the post-processing of feature negotiation state, after\n" "> the negotiation has completed.\n" ">\n" @@ -53,7 +71,7 @@ "> +\tstruct dccp_sock *dp = dccp_sk(sk);\n" "> +\tstruct ccid *new_ccid = ccid_new(ccid, sk, rx, gfp_any());\n" "> +\n" - "> +\tif (new_ccid = NULL)\n" + "> +\tif (new_ccid == NULL)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" "> +\tif (rx) {\n" @@ -87,9 +105,9 @@ "> +\tstruct dccp_sock *dp = dccp_sk(sk);\n" "> +\n" "> +\tif (rx) {\n" - "> +\t\tif (enable && dp->dccps_hc_rx_ackvec = NULL) {\n" + "> +\t\tif (enable && dp->dccps_hc_rx_ackvec == NULL) {\n" "> +\t\t\tdp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(gfp_any());\n" - "> +\t\t\tif (dp->dccps_hc_rx_ackvec = NULL)\n" + "> +\t\t\tif (dp->dccps_hc_rx_ackvec == NULL)\n" "> +\t\t\t\treturn -ENOMEM;\n" "> +\t\t} else if (!enable) {\n" "> +\t\t\tdccp_ackvec_free(dp->dccps_hc_rx_ackvec);\n" @@ -122,7 +140,7 @@ "> +\tif (rx)\n" "> +\t\tdp->dccps_pcrlen = cscov;\n" "> +\telse {\n" - "> +\t\tif (dp->dccps_pcslen = 0)\n" + "> +\t\tif (dp->dccps_pcslen == 0)\n" "> +\t\t\tdp->dccps_pcslen = cscov;\n" "> +\t\telse if (cscov > dp->dccps_pcslen)\n" "> +\t\t\tDCCP_WARN(\"CsCov %u too small, peer requires >= %u\\n\",\n" @@ -179,13 +197,13 @@ "> +\n" "> +\tif (idx < 0 || idx >= DCCP_FEAT_SUPPORTED_MAX)\n" "> +\t\treturn -1;\n" - "> +\tif (dccp_feat_table[idx].activation_hdlr = NULL)\n" + "> +\tif (dccp_feat_table[idx].activation_hdlr == NULL)\n" "> +\t\treturn 0;\n" "> +\n" - "> +\tif (fval = NULL) {\n" + "> +\tif (fval == NULL) {\n" "> +\t\tval = dccp_feat_table[idx].default_value;\n" - "> +\t} else if (dccp_feat_table[idx].reconciliation = FEAT_SP) {\n" - "> +\t\tif (fval->sp.vec = NULL) {\n" + "> +\t} else if (dccp_feat_table[idx].reconciliation == FEAT_SP) {\n" + "> +\t\tif (fval->sp.vec == NULL) {\n" "> +\t\t\t/*\n" "> +\t\t\t * This can happen when an empty Confirm is sent\n" "> +\t\t\t * for an SP (i.e. known) feature. In this case\n" @@ -201,7 +219,7 @@ "> +\t}\n" "> +\n" "> +\t/* Location is RX if this is a local-RX or remote-TX feature */\n" - "> +\trx = (is_local = (dccp_feat_table[idx].rxtx = FEAT_AT_RX));\n" + "> +\trx = (is_local == (dccp_feat_table[idx].rxtx == FEAT_AT_RX));\n" "> +\n" "> +\treturn dccp_feat_table[idx].activation_hdlr(sk, val, rx);\n" "> +}\n" @@ -307,4 +325,4 @@ "> {\n" > -962bb7dc6e0186a28ce20df3860fe9045b5aec8a0c43c5005d5d01bc0a1c9e3e +579ca8a06051e92819e444c139d9957ece4ce409c08142c3fb12a6449ae8dda1
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.