diff for duplicates of <1467028161.1847.101.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 0624b70..9d80dcc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,26 +7,26 @@ On Mon, 2016-06-27 at 17:54 +0800, Yisen Zhuang wrote: > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c [] > @@ -2567,15 +2567,15 @@ static char *hns_dsaf_get_node_stats_strings(char *data, int node, -> ? buff += ETH_GSTRING_LEN; -> ? if (node < DSAF_SERVICE_NW_NUM && !is_ver1) { -> ? for (i = 0; i < DSAF_PRIO_NR; i++) { +> buff += ETH_GSTRING_LEN; +> if (node < DSAF_SERVICE_NW_NUM && !is_ver1) { +> for (i = 0; i < DSAF_PRIO_NR; i++) { > - snprintf(buff, ETH_GSTRING_LEN, -> - ?"inod%d_pfc_prio%d_pkts", node, i); +> - "inod%d_pfc_prio%d_pkts", node, i); > - buff += ETH_GSTRING_LEN; > - } > - for (i = 0; i < DSAF_PRIO_NR; i++) { > - snprintf(buff, ETH_GSTRING_LEN, -> - ?"onod%d_pfc_prio%d_pkts", node, i); +> - "onod%d_pfc_prio%d_pkts", node, i); > + snprintf(buff + 0 * ETH_GSTRING_LEN * DSAF_PRIO_NR, -> + ?ETH_GSTRING_LEN, "inod%d_pfc_prio%d_pkts", -> + ?node, i); +> + ETH_GSTRING_LEN, "inod%d_pfc_prio%d_pkts", +> + node, i); > + snprintf(buff + 1 * ETH_GSTRING_LEN * DSAF_PRIO_NR, -> + ?ETH_GSTRING_LEN, "onod%d_pfc_prio%d_pkts", -> + ?node, i); -> ? buff += ETH_GSTRING_LEN; +> + ETH_GSTRING_LEN, "onod%d_pfc_prio%d_pkts", +> + node, i); +> buff += ETH_GSTRING_LEN; This looks odd and likely incorrect. -> ? } +> } > + buff += 1 * DSAF_PRIO_NR * ETH_GSTRING_LEN; -> ? } +> } diff --git a/a/content_digest b/N1/content_digest index 8659e8d..ea7ffa9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,25 @@ "ref\01467021255-95900-1-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01467021255-95900-7-git-send-email-Yisen.Zhuang@huawei.com\0" - "From\0joe@perches.com (Joe Perches)\0" - "Subject\0[PATCH net-next 6/9] net: hns: normalize two different loop\0" + "From\0Joe Perches <joe@perches.com>\0" + "Subject\0Re: [PATCH net-next 6/9] net: hns: normalize two different loop\0" "Date\0Mon, 27 Jun 2016 04:49:21 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yisen Zhuang <Yisen.Zhuang@huawei.com>" + davem@davemloft.net + salil.mehta@huawei.com + " yankejian@huawei.com\0" + "Cc\0liguozhu@huawei.com" + huangdaode@hisilicon.com + arnd@arndb.de + andriy.shevchenko@linux.intel.com + andrew@lunn.ch + geliangtang@163.com + ivecera@redhat.com + fengguang.wu@intel.com + charles.chenxin@huawei.com + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linuxarm@huawei.com\0" "\00:1\0" "b\0" "On Mon, 2016-06-27 at 17:54 +0800, Yisen Zhuang wrote:\n" @@ -15,28 +31,28 @@ "> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c\n" "[]\n" "> @@ -2567,15 +2567,15 @@ static char *hns_dsaf_get_node_stats_strings(char *data, int node,\n" - "> ?\tbuff += ETH_GSTRING_LEN;\n" - "> ?\tif (node < DSAF_SERVICE_NW_NUM && !is_ver1) {\n" - "> ?\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" + "> \302\240\tbuff += ETH_GSTRING_LEN;\n" + "> \302\240\tif (node < DSAF_SERVICE_NW_NUM && !is_ver1) {\n" + "> \302\240\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" "> -\t\t\tsnprintf(buff, ETH_GSTRING_LEN,\n" - "> -\t\t\t\t?\"inod%d_pfc_prio%d_pkts\", node, i);\n" + "> -\t\t\t\t\302\240\"inod%d_pfc_prio%d_pkts\", node, i);\n" "> -\t\t\tbuff += ETH_GSTRING_LEN;\n" "> -\t\t}\n" "> -\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" "> -\t\t\tsnprintf(buff, ETH_GSTRING_LEN,\n" - "> -\t\t\t\t?\"onod%d_pfc_prio%d_pkts\", node, i);\n" + "> -\t\t\t\t\302\240\"onod%d_pfc_prio%d_pkts\", node, i);\n" "> +\t\t\tsnprintf(buff + 0 * ETH_GSTRING_LEN * DSAF_PRIO_NR,\n" - "> +\t\t\t\t?ETH_GSTRING_LEN, \"inod%d_pfc_prio%d_pkts\",\n" - "> +\t\t\t\t?node, i);\n" + "> +\t\t\t\t\302\240ETH_GSTRING_LEN, \"inod%d_pfc_prio%d_pkts\",\n" + "> +\t\t\t\t\302\240node, i);\n" "> +\t\t\tsnprintf(buff + 1 * ETH_GSTRING_LEN * DSAF_PRIO_NR,\n" - "> +\t\t\t\t?ETH_GSTRING_LEN, \"onod%d_pfc_prio%d_pkts\",\n" - "> +\t\t\t\t?node, i);\n" - "> ?\t\t\tbuff += ETH_GSTRING_LEN;\n" + "> +\t\t\t\t\302\240ETH_GSTRING_LEN, \"onod%d_pfc_prio%d_pkts\",\n" + "> +\t\t\t\t\302\240node, i);\n" + "> \302\240\t\t\tbuff += ETH_GSTRING_LEN;\n" "\n" "This looks odd and likely incorrect.\n" "\n" - "> ?\t\t}\n" + "> \302\240\t\t}\n" "> +\t\tbuff += 1 * DSAF_PRIO_NR * ETH_GSTRING_LEN;\n" - "> ?\t}" + "> \302\240\t}" -729cb7837e28332be467f7a30191d747b2c97ba1c3fde8e875cc783d641905e5 +06f1b04242f68a58293010966d4726629c2077fba68b0db561a9e8b18cd10f8c
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.