net: hns: normalize two different loop
authorDaode Huang <huangdaode@hisilicon.com>
Fri, 1 Jul 2016 09:34:10 +0000 (17:34 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Jul 2016 20:56:52 +0000 (16:56 -0400)
There are two approaches to assign data, one does 2 loops, another
does 1 loop. This patch normalize the different methods to 1 loop.

Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

index e36ee2261b2d427a5565b9f3417932b5a1d7b7e8..86ce28aa11d0c76dd7112c6aac1cacac2fa7246c 100644 (file)
@@ -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++) {
-                       snprintf(buff, ETH_GSTRING_LEN,
-                                "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);
+                       snprintf(buff + 0 * ETH_GSTRING_LEN * DSAF_PRIO_NR,
+                                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;
                }
+               buff += 1 * DSAF_PRIO_NR * ETH_GSTRING_LEN;
        }
        snprintf(buff, ETH_GSTRING_LEN, "onnod%d_tx_pkts", node);
        buff += ETH_GSTRING_LEN;
@@ -2606,8 +2606,8 @@ static u64 *hns_dsaf_get_node_stats(struct dsaf_device *ddev, u64 *data,
        p[12] = hw_stats->stp_drop;
        if (node_num < DSAF_SERVICE_NW_NUM && !is_ver1) {
                for (i = 0; i < DSAF_PRIO_NR; i++) {
-                       p[13 + i] = hw_stats->rx_pfc[i];
-                       p[13 + i + DSAF_PRIO_NR] = hw_stats->tx_pfc[i];
+                       p[13 + i + 0 * DSAF_PRIO_NR] = hw_stats->rx_pfc[i];
+                       p[13 + i + 1 * DSAF_PRIO_NR] = hw_stats->tx_pfc[i];
                }
                p[29] = hw_stats->tx_pkts;
                return &p[30];