diff for duplicates of <1466505178.30123.201.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index a0548c2..b27eb41 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,29 +8,29 @@ On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > +static char *hns_dsaf_get_node_stats_strings(char *data, int node, -> + ?????struct dsaf_device +> + struct dsaf_device > *dsaf_dev) -> ?{ -> ? char *buff = data; +> { +> char *buff = data; > + int i; > + bool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver); -> ? -> ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", +> +> snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", > node); -> ? buff = buff + ETH_GSTRING_LEN; +> buff = buff + ETH_GSTRING_LEN; > @@ -2502,6 +2530,18 @@ static char > *hns_dsaf_get_node_stats_strings(char *data, int node) -> ? buff = buff + ETH_GSTRING_LEN; -> ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", +> buff = buff + ETH_GSTRING_LEN; +> snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", > node); -> ? buff = buff + ETH_GSTRING_LEN; +> buff = buff + ETH_GSTRING_LEN; > + if ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { Redundant parens. > + 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 = buff + ETH_GSTRING_LEN; buff += ... @@ -38,24 +38,24 @@ buff += ... > + } > + 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); > + buff = buff + ETH_GSTRING_LEN; Ditto. -> ?{ -> ? u64 *p = data; +> { +> u64 *p = data; > + int i; -> ? struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; +> struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; > + bool is_ver1 = AE_IS_VER1(ddev->dsaf_ver); -> ? -> ? p[0] = hw_stats->pad_drop; -> ? p[1] = hw_stats->man_pkts; +> +> p[0] = hw_stats->pad_drop; +> p[1] = hw_stats->man_pkts; > @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct > dsaf_device *ddev, u64 *data, -> ? p[10] = hw_stats->local_addr_false; -> ? p[11] = hw_stats->vlan_drop; -> ? p[12] = hw_stats->stp_drop; +> p[10] = hw_stats->local_addr_false; +> p[11] = hw_stats->vlan_drop; +> p[12] = hw_stats->stp_drop; > - p[13] = hw_stats->tx_pkts; > + if ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { > + for (i = 0; i < DSAF_PRIO_NR; i++) { @@ -70,10 +70,10 @@ here you put everything to one. > + p[29] = hw_stats->tx_pkts; > + return &p[30]; > + } -> ? +> > + p[13] = hw_stats->tx_pkts; -> ? return &p[14]; -> ?} +> return &p[14]; +> } -- diff --git a/a/content_digest b/N1/content_digest index 31f692f..38ade46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,24 @@ "ref\01466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics\0" "Date\0Tue, 21 Jun 2016 13:32:58 +0300\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 + 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 Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote:\n" @@ -16,29 +31,29 @@ "\n" "\n" "> +static char *hns_dsaf_get_node_stats_strings(char *data, int node,\n" - "> +\t\t\t\t\t?????struct dsaf_device\n" + "> +\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240struct dsaf_device\n" "> *dsaf_dev)\n" - "> ?{\n" - "> ?\tchar *buff = data;\n" + "> \302\240{\n" + "> \302\240\tchar *buff = data;\n" "> +\tint i;\n" "> +\tbool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver);\n" - "> ?\n" - "> ?\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_pad_drop_pkts\",\n" + "> \302\240\n" + "> \302\240\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_pad_drop_pkts\",\n" "> node);\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" "> @@ -2502,6 +2530,18 @@ static char\n" "> *hns_dsaf_get_node_stats_strings(char *data, int node)\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" - "> ?\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_stp_drop_pkts\",\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_stp_drop_pkts\",\n" "> node);\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" "> +\tif ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) {\n" "\n" "Redundant parens.\n" "\n" "> +\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 = buff + ETH_GSTRING_LEN;\n" "\n" "buff += ...\n" @@ -46,24 +61,24 @@ "> +\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\tbuff = buff + ETH_GSTRING_LEN;\n" "\n" "Ditto.\n" "\n" - "> ?{\n" - "> ?\tu64 *p = data;\n" + "> \302\240{\n" + "> \302\240\tu64 *p = data;\n" "> +\tint i;\n" - "> ?\tstruct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num];\n" + "> \302\240\tstruct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num];\n" "> +\tbool is_ver1 = AE_IS_VER1(ddev->dsaf_ver);\n" - "> ?\n" - "> ?\tp[0] = hw_stats->pad_drop;\n" - "> ?\tp[1] = hw_stats->man_pkts;\n" + "> \302\240\n" + "> \302\240\tp[0] = hw_stats->pad_drop;\n" + "> \302\240\tp[1] = hw_stats->man_pkts;\n" "> @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct\n" "> dsaf_device *ddev, u64 *data,\n" - "> ?\tp[10] = hw_stats->local_addr_false;\n" - "> ?\tp[11] = hw_stats->vlan_drop;\n" - "> ?\tp[12] = hw_stats->stp_drop;\n" + "> \302\240\tp[10] = hw_stats->local_addr_false;\n" + "> \302\240\tp[11] = hw_stats->vlan_drop;\n" + "> \302\240\tp[12] = hw_stats->stp_drop;\n" "> -\tp[13] = hw_stats->tx_pkts;\n" "> +\tif ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) {\n" "> +\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" @@ -78,14 +93,14 @@ "> +\t\tp[29] = hw_stats->tx_pkts;\n" "> +\t\treturn &p[30];\n" "> +\t}\n" - "> ?\n" + "> \302\240\n" "> +\tp[13] = hw_stats->tx_pkts;\n" - "> ?\treturn &p[14];\n" - "> ?}\n" + "> \302\240\treturn &p[14];\n" + "> \302\240}\n" "\n" "-- \n" "\n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -3cb8117c8e0b9457b7f97be54db7f3cd71d5b501d85514d3a3e9b5d311418f8d +f22be42a3000462ff3196c50bc177eb5841357c883e3ebe1af2ff428de9a3faf
diff --git a/a/1.txt b/N2/1.txt index a0548c2..6792ada 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,29 +8,29 @@ On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > +static char *hns_dsaf_get_node_stats_strings(char *data, int node, -> + ?????struct dsaf_device +> + struct dsaf_device > *dsaf_dev) -> ?{ -> ? char *buff = data; +> { +> char *buff = data; > + int i; > + bool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver); -> ? -> ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", +> +> snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", > node); -> ? buff = buff + ETH_GSTRING_LEN; +> buff = buff + ETH_GSTRING_LEN; > @@ -2502,6 +2530,18 @@ static char > *hns_dsaf_get_node_stats_strings(char *data, int node) -> ? buff = buff + ETH_GSTRING_LEN; -> ? snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", +> buff = buff + ETH_GSTRING_LEN; +> snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", > node); -> ? buff = buff + ETH_GSTRING_LEN; +> buff = buff + ETH_GSTRING_LEN; > + if ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { Redundant parens. > + 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 = buff + ETH_GSTRING_LEN; buff += ... @@ -38,24 +38,24 @@ buff += ... > + } > + 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); > + buff = buff + ETH_GSTRING_LEN; Ditto. -> ?{ -> ? u64 *p = data; +> { +> u64 *p = data; > + int i; -> ? struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; +> struct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num]; > + bool is_ver1 = AE_IS_VER1(ddev->dsaf_ver); -> ? -> ? p[0] = hw_stats->pad_drop; -> ? p[1] = hw_stats->man_pkts; +> +> p[0] = hw_stats->pad_drop; +> p[1] = hw_stats->man_pkts; > @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct > dsaf_device *ddev, u64 *data, -> ? p[10] = hw_stats->local_addr_false; -> ? p[11] = hw_stats->vlan_drop; -> ? p[12] = hw_stats->stp_drop; +> p[10] = hw_stats->local_addr_false; +> p[11] = hw_stats->vlan_drop; +> p[12] = hw_stats->stp_drop; > - p[13] = hw_stats->tx_pkts; > + if ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { > + for (i = 0; i < DSAF_PRIO_NR; i++) { @@ -70,12 +70,17 @@ here you put everything to one. > + p[29] = hw_stats->tx_pkts; > + return &p[30]; > + } -> ? +> > + p[13] = hw_stats->tx_pkts; -> ? return &p[14]; -> ?} +> return &p[14]; +> } -- Andy Shevchenko <andriy.shevchenko@linux.intel.com> Intel Finland Oy + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N2/content_digest index 31f692f..b6fc7f0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,24 @@ "ref\01466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com\0" - "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" - "Subject\0[PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics\0" + "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" + "Subject\0Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics\0" "Date\0Tue, 21 Jun 2016 13:32:58 +0300\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\0ivecera@redhat.com" + andrew@lunn.ch + liguozhu@huawei.com + arnd@arndb.de + charles.chenxin@huawei.com + linux-kernel@vger.kernel.org + linuxarm@huawei.com + geliangtang@163.com + huangdaode@hisilicon.com + netdev@vger.kernel.org + fengguang.wu@intel.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote:\n" @@ -16,29 +31,29 @@ "\n" "\n" "> +static char *hns_dsaf_get_node_stats_strings(char *data, int node,\n" - "> +\t\t\t\t\t?????struct dsaf_device\n" + "> +\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240struct dsaf_device\n" "> *dsaf_dev)\n" - "> ?{\n" - "> ?\tchar *buff = data;\n" + "> \302\240{\n" + "> \302\240\tchar *buff = data;\n" "> +\tint i;\n" "> +\tbool is_ver1 = AE_IS_VER1(dsaf_dev->dsaf_ver);\n" - "> ?\n" - "> ?\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_pad_drop_pkts\",\n" + "> \302\240\n" + "> \302\240\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_pad_drop_pkts\",\n" "> node);\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" "> @@ -2502,6 +2530,18 @@ static char\n" "> *hns_dsaf_get_node_stats_strings(char *data, int node)\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" - "> ?\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_stp_drop_pkts\",\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tsnprintf(buff, ETH_GSTRING_LEN, \"innod%d_stp_drop_pkts\",\n" "> node);\n" - "> ?\tbuff = buff + ETH_GSTRING_LEN;\n" + "> \302\240\tbuff = buff + ETH_GSTRING_LEN;\n" "> +\tif ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) {\n" "\n" "Redundant parens.\n" "\n" "> +\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 = buff + ETH_GSTRING_LEN;\n" "\n" "buff += ...\n" @@ -46,24 +61,24 @@ "> +\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\tbuff = buff + ETH_GSTRING_LEN;\n" "\n" "Ditto.\n" "\n" - "> ?{\n" - "> ?\tu64 *p = data;\n" + "> \302\240{\n" + "> \302\240\tu64 *p = data;\n" "> +\tint i;\n" - "> ?\tstruct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num];\n" + "> \302\240\tstruct dsaf_hw_stats *hw_stats = &ddev->hw_stats[node_num];\n" "> +\tbool is_ver1 = AE_IS_VER1(ddev->dsaf_ver);\n" - "> ?\n" - "> ?\tp[0] = hw_stats->pad_drop;\n" - "> ?\tp[1] = hw_stats->man_pkts;\n" + "> \302\240\n" + "> \302\240\tp[0] = hw_stats->pad_drop;\n" + "> \302\240\tp[1] = hw_stats->man_pkts;\n" "> @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct\n" "> dsaf_device *ddev, u64 *data,\n" - "> ?\tp[10] = hw_stats->local_addr_false;\n" - "> ?\tp[11] = hw_stats->vlan_drop;\n" - "> ?\tp[12] = hw_stats->stp_drop;\n" + "> \302\240\tp[10] = hw_stats->local_addr_false;\n" + "> \302\240\tp[11] = hw_stats->vlan_drop;\n" + "> \302\240\tp[12] = hw_stats->stp_drop;\n" "> -\tp[13] = hw_stats->tx_pkts;\n" "> +\tif ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) {\n" "> +\t\tfor (i = 0; i < DSAF_PRIO_NR; i++) {\n" @@ -78,14 +93,19 @@ "> +\t\tp[29] = hw_stats->tx_pkts;\n" "> +\t\treturn &p[30];\n" "> +\t}\n" - "> ?\n" + "> \302\240\n" "> +\tp[13] = hw_stats->tx_pkts;\n" - "> ?\treturn &p[14];\n" - "> ?}\n" + "> \302\240\treturn &p[14];\n" + "> \302\240}\n" "\n" "-- \n" "\n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" - Intel Finland Oy + "Intel Finland Oy\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -3cb8117c8e0b9457b7f97be54db7f3cd71d5b501d85514d3a3e9b5d311418f8d +29690e208b35f371c59bd7b5f2160711a6c23c2d351fcdbbcd7f1d611737bbc9
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.