diff for duplicates of <1466588498.30123.235.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index b6356c0..17b59e6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote: > -> ? 2016/6/21 18:32, Andy Shevchenko ??: +> 在 2016/6/21 18:32, Andy Shevchenko 写道: > > On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: > > > From: Daode Huang <huangdaode@hisilicon.com> > > > @@ -8,33 +8,33 @@ On Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote: > > > so change the statistics of pfc pause in dsaf and remove the old > > > pfc pause frame statistics. > > > -> >? +> > > > > > > +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, +> > > + "inod%d_pfc_prio%d_pkts", node, > > > i); > > > + buff = buff + ETH_GSTRING_LEN; > > @@ -43,26 +43,26 @@ On Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote: > > > + } > > > + for (i = 0; i < DSAF_PRIO_NR; i++) { > > > + snprintf(buff, ETH_GSTRING_LEN, -> > > + ?"onod%d_pfc_prio%d_pkts", node, +> > > + "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- +> > > 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++) { @@ -78,7 +78,7 @@ On Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote: > unknowable. It doesn't matter since you are incrementing start position by -constant.? +constant. snprintf(buff, ETH_GSTRING_LEN, "inod%d_pfc_prio%d_pkts", node, i); snprintf(buff, ETH_GSTRING_LEN, "onod%d_pfc_prio%d_pkts", node, i); diff --git a/a/content_digest b/N1/content_digest index d6a057d..e5ec2b5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,30 @@ "ref\01466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com\0" "ref\01466505178.30123.201.camel@linux.intel.com\0" "ref\05769ED55.3000408@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\0Wed, 22 Jun 2016 12:41:38 +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 Wed, 2016-06-22 at 09:43 +0800, Yisen Zhuang wrote:\n" "> \n" - "> ? 2016/6/21 18:32, Andy Shevchenko ??:\n" + "> \345\234\250 2016/6/21 18:32, Andy Shevchenko \345\206\231\351\201\223:\n" "> > On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote:\n" "> > > From: Daode Huang <huangdaode@hisilicon.com>\n" "> > > \n" @@ -18,33 +33,33 @@ "> > > so change the statistics of pfc pause in dsaf and remove the old\n" "> > > pfc pause frame statistics.\n" "> > > \n" - "> >?\n" + "> >\302\240\n" "> > \n" "> > > +static char *hns_dsaf_get_node_stats_strings(char *data, int\n" "> > > 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,\n" + "> > > +\t\t\t\t\302\240\"inod%d_pfc_prio%d_pkts\", node,\n" "> > > i);\n" "> > > +\t\t\tbuff = buff + ETH_GSTRING_LEN;\n" "> > \n" @@ -53,26 +68,26 @@ "> > > +\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,\n" + "> > > +\t\t\t\t\302\240\"onod%d_pfc_prio%d_pkts\", node,\n" "> > > 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-\n" + "> > > \302\240\tstruct dsaf_hw_stats *hw_stats = &ddev-\n" "> > > >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" @@ -88,7 +103,7 @@ "> unknowable.\n" "\n" "It doesn't matter since you are incrementing start position by\n" - "constant.?\n" + "constant.\302\240\n" "\n" "snprintf(buff, ETH_GSTRING_LEN, \"inod%d_pfc_prio%d_pkts\", node, i);\n" "snprintf(buff, ETH_GSTRING_LEN, \"onod%d_pfc_prio%d_pkts\", node, i);\n" @@ -118,4 +133,4 @@ "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -c91894435ba5bd93797d855975effdab7274fb92c1b09bb8da816ea93d3f1dd8 +a7e87ffca98347f35450b8cb0dddf276febb9c97dad858f93b0ffa2e6a70b71e
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.