From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 6F5452A66 for ; Sun, 22 Apr 2018 17:12:04 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E552E20FED; Sun, 22 Apr 2018 11:12:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:12:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=mcJUl9lItDM2HY7Dj VXWVs/Y01UAMX9TJhcSe4hOUy4=; b=LtWRQoIpxWYcPGXwjtx5rdSQNGq1XYVTh ST4i3EuZVC3pNhoPzr/QdOyDohRanv7NXdVFeAlqFORNQMl+yUEhrytEpjf2vKdD OyVv38X0Yjmcgp6prot/oQeh8ZeSvuxjk5GSwP7nivUlrH0YS0zZCqzzCWEsp5ky q0pYmPw+dvIprV6N0zRmf6k8qv+g1Bk9vLePLEuSRF4oWAWxAkQ9xWO92oOCwB9d Z7OpS1Phnb1xlPwtvoXGPnq54Sy59IF1CAnL4dn56tZUQc7VB/nESsFEt5MAbjeg WNyWDxGFgzyWlnlKX3HKRez0Uw/CfA5IXd3I9ta/MCCZeNCrkriLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=mcJUl9lItDM2HY7DjVXWVs/Y01UAMX9TJhcSe4hOUy4=; b=Q45TuuWY ALfgEJvqIaT7G2KOWg3eRUBdPGIxapfWTYqMFBbr0+WEWWiM7A7pxoOYIPENvaf6 X3ONz90RiL/lRkbqF7a6mZ3BLirTUn29RZZ9opqspRQJfxulaXjPU8KJviPxE7x2 4ZAgKfSxtH3TfQGYw0UqxDBDBNSbu/wqAsT0A5L1J98Xv+HVQWvjhXAaBqBrElVG uic4RURofxa0NlvMLRCX644UfY/gbsVrHZ1Vulu+MOm9lV4wm41E2Nk/uh2C2z0S +73DrXBz/iQbP05OXCyDpR+VHrJK7Lw8lNvooeSeozha5z8UeTwGh7wdqaXyMj3u +sybDfsYfgibNA== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 016541025D; Sun, 22 Apr 2018 11:12:01 -0400 (EDT) From: Yuanhan Liu To: Hemant Agrawal Cc: dpdk stable Date: Sun, 22 Apr 2018 23:09:35 +0800 Message-Id: <20180422150949.17523-45-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/dpaa2: fix xstats' has been queued to LTS release 17.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Apr 2018 15:12:04 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 2470d2d0dba2d91c6547a1e88e7b22b4a2a0749d Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Mon, 9 Apr 2018 15:52:50 +0530 Subject: [PATCH] net/dpaa2: fix xstats [ upstream commit 876b2c902ea0480f3bd0f4f9361e8e0ad9745ff3 ] Fixes: 1d6329b2fc1f ("net/dpaa2: support extra stats") Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 202f84f0a..0711baf10 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1144,12 +1144,12 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, union dpni_statistics value[3] = {}; unsigned int i = 0, num = RTE_DIM(dpaa2_xstats_strings); - if (xstats == NULL) - return 0; - if (n < num) return num; + if (xstats == NULL) + return 0; + /* Get Counters from page_0*/ retcode = dpni_get_statistics(dpni, CMD_PRI_LOW, priv->token, 0, 0, &value[0]); @@ -1182,10 +1182,13 @@ err: static int dpaa2_xstats_get_names(__rte_unused struct rte_eth_dev *dev, struct rte_eth_xstat_name *xstats_names, - __rte_unused unsigned int limit) + unsigned int limit) { unsigned int i, stat_cnt = RTE_DIM(dpaa2_xstats_strings); + if (limit < stat_cnt) + return stat_cnt; + if (xstats_names != NULL) for (i = 0; i < stat_cnt; i++) snprintf(xstats_names[i].name, -- 2.11.0