From patchwork Thu Jul 21 17:22:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 14972 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5279558D4; Thu, 21 Jul 2016 19:24:01 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 4D9AB58C3 for ; Thu, 21 Jul 2016 19:23:58 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 21 Jul 2016 10:23:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,400,1464678000"; d="scan'208";a="737855244" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 21 Jul 2016 10:23:57 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u6LHNu8i016897; Thu, 21 Jul 2016 18:23:56 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u6LHNu4s026239; Thu, 21 Jul 2016 18:23:56 +0100 Received: (from fyigit@localhost) by sivswdev02.ir.intel.com with id u6LHNuH7026235; Thu, 21 Jul 2016 18:23:56 +0100 X-Authentication-Warning: sivswdev02.ir.intel.com: fyigit set sender to ferruh.yigit@intel.com using -f From: Ferruh Yigit To: dev@dpdk.org Cc: Nicolas Pernas Maradei Date: Thu, 21 Jul 2016 18:22:46 +0100 Message-Id: <1469121780-26099-8-git-send-email-ferruh.yigit@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1469121780-26099-1-git-send-email-ferruh.yigit@intel.com> References: <1469121780-26099-1-git-send-email-ferruh.yigit@intel.com> Subject: [dpdk-dev] [RFC 07/21] net/pcap: don't carry kvlist argument X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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; }