All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ferruh Yigit <ferruh.yigit@intel.com>
To: dev@dpdk.org
Cc: Nicolas Pernas Maradei <nicolas.pernas.maradei@emutex.com>
Subject: [RFC 07/21] net/pcap: don't carry kvlist argument
Date: Thu, 21 Jul 2016 18:22:46 +0100	[thread overview]
Message-ID: <1469121780-26099-8-git-send-email-ferruh.yigit@intel.com> (raw)
In-Reply-To: <1469121780-26099-1-git-send-email-ferruh.yigit@intel.com>

Don't carry kvlist argument into sub function and used it, use kvlist
argument in upper level of call stack.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/pcap/rte_eth_pcap.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 94d7c88..3eacb82 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -787,18 +787,10 @@ open_single_iface(const char *iface, pcap_t **pcap)
 static int
 rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,
 		const unsigned nb_tx_queues, struct pmd_internals **internals,
-		struct rte_eth_dev **eth_dev, struct rte_kvargs *kvlist)
+		struct rte_eth_dev **eth_dev)
 {
 	struct rte_eth_dev_data *data = NULL;
 	unsigned int numa_node = rte_socket_id();
-	unsigned k_idx;
-	struct rte_kvargs_pair *pair = NULL;
-
-	for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
-		pair = &kvlist->pairs[k_idx];
-		if (strstr(pair->key, ETH_PCAP_IFACE_ARG) != NULL)
-			break;
-	}
 
 	RTE_LOG(INFO, PMD, "Creating pcap-backed ethdev on numa socket %u\n",
 		numa_node);
@@ -833,11 +825,6 @@ rte_pmd_init_internals(const char *name, const unsigned nb_rx_queues,
 	/* NOTE: we'll replace the data element, of originally allocated eth_dev
 	 * so the rings are local per-process */
 
-	if (pair == NULL)
-		(*internals)->if_index = 0;
-	else
-		(*internals)->if_index = if_nametoindex(pair->value);
-
 	data->dev_private = *internals;
 	data->port_id = (*eth_dev)->data->port_id;
 	snprintf(data->name, sizeof(data->name), "%s", (*eth_dev)->data->name);
@@ -871,6 +858,8 @@ rte_eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
 		const unsigned nb_tx_queues, struct rte_kvargs *kvlist,
 		struct pmd_internals **internals, struct rte_eth_dev **eth_dev)
 {
+	struct rte_kvargs_pair *pair = NULL;
+	unsigned k_idx;
 	unsigned i;
 
 	/* do some parameter checking */
@@ -880,7 +869,7 @@ rte_eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
 		return -1;
 
 	if (rte_pmd_init_internals(name, nb_rx_queues, nb_tx_queues, internals,
-			eth_dev, kvlist) < 0)
+			eth_dev) < 0)
 		return -1;
 
 	for (i = 0; i < nb_rx_queues; i++) {
@@ -902,6 +891,17 @@ rte_eth_from_pcaps_common(const char *name, struct pmd_devargs *rx_queues,
 			tx_queues->queue[i].type);
 	}
 
+	for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
+		pair = &kvlist->pairs[k_idx];
+		if (strstr(pair->key, ETH_PCAP_IFACE_ARG) != NULL)
+			break;
+	}
+
+	if (pair == NULL)
+		(*internals)->if_index = 0;
+	else
+		(*internals)->if_index = if_nametoindex(pair->value);
+
 	return 0;
 }
 
-- 
2.7.4

  parent reply	other threads:[~2016-07-21 17:23 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-21 17:22 [RFC 00/21] pcap pmd improvements Ferruh Yigit
2016-07-21 17:22 ` [RFC 01/21] net/pcap: create own configuration parameter Ferruh Yigit
2016-07-21 17:22 ` [RFC 02/21] net/pcap: use macros for param string Ferruh Yigit
2016-07-21 17:22 ` [RFC 03/21] net/pcap: reorganize private structs Ferruh Yigit
2016-07-21 17:22 ` [RFC 04/21] net/pcap: add checks for max queue number Ferruh Yigit
2016-07-21 17:22 ` [RFC 05/21] net/pcap: update function to reuse it Ferruh Yigit
2016-07-21 17:22 ` [RFC 06/21] net/pcap: don't carry numa_node argument Ferruh Yigit
2016-07-21 17:22 ` Ferruh Yigit [this message]
2016-07-21 17:22 ` [RFC 08/21] net/pcap: move comment to correct place Ferruh Yigit
2016-07-21 17:22 ` [RFC 09/21] net/pcap: remove duplicated max queue number check Ferruh Yigit
2016-07-21 17:22 ` [RFC 10/21] net/pcap: use single_iface variable instead of hardcoded Ferruh Yigit
2016-07-21 17:22 ` [RFC 11/21] net/pcap: group stats related fields into a struct Ferruh Yigit
2016-07-21 17:22 ` [RFC 12/21] net/pcap: make const array static Ferruh Yigit
2016-07-21 17:22 ` [RFC 13/21] net/pcap: reorder header files Ferruh Yigit
2016-07-21 17:22 ` [RFC 14/21] net/pcap: reorder functions Ferruh Yigit
2016-07-21 17:22 ` [RFC 15/21] net/pcap: update how single iface handled Ferruh Yigit
2016-07-21 17:22 ` [RFC 16/21] net/pcap: remove unnecessary check Ferruh Yigit
2016-07-21 17:22 ` [RFC 17/21] net/pcap: remove redundant assignment Ferruh Yigit
2016-07-21 17:22 ` [RFC 18/21] net/pcap: simplify function Ferruh Yigit
2016-07-21 17:22 ` [RFC 19/21] net/pcap: fix missing tx iface assignment Ferruh Yigit
2016-07-21 17:22 ` [RFC 20/21] net/pcap: coding convention updates Ferruh Yigit
2016-07-21 17:23 ` [RFC 21/21] net/pcap: remove rte prefix from static functions Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469121780-26099-8-git-send-email-ferruh.yigit@intel.com \
    --to=ferruh.yigit@intel.com \
    --cc=dev@dpdk.org \
    --cc=nicolas.pernas.maradei@emutex.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.