From patchwork Mon Feb 6 19:40:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wiles, Keith" X-Patchwork-Id: 20200 X-Patchwork-Delegate: ferruh.yigit@amd.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 2B5815911; Mon, 6 Feb 2017 20:41:04 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 59F9714EC for ; Mon, 6 Feb 2017 20:40:43 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2017 11:40:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,342,1477983600"; d="scan'208"; a="1122886371" Received: from fshahid-mobl2.amr.corp.intel.com ([10.254.19.238]) by fmsmga002.fm.intel.com with ESMTP; 06 Feb 2017 11:40:41 -0800 From: Keith Wiles To: dev@dpdk.org Cc: pascal.mazon@6wind.com, ferruh.yigit@intel.com Date: Mon, 6 Feb 2017 13:40:33 -0600 Message-Id: <20170206194038.9246-2-keith.wiles@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170206194038.9246-1-keith.wiles@intel.com> References: <20170206194038.9246-1-keith.wiles@intel.com> In-Reply-To: <20170202223330.39240-1-keith.wiles@intel.com> References: <20170202223330.39240-1-keith.wiles@intel.com> Subject: [dpdk-dev] [PATCH v3 2/7] net/tap: remove redundant fds array X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index c7b04bb..6d93eb7 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -103,7 +103,6 @@ struct pmd_internals { struct ether_addr eth_addr; /* Mac address of the device port */ int if_index; /* IF_INDEX for the port */ - int fds[RTE_PMD_TAP_MAX_QUEUES]; /* List of all file descriptors */ struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */ struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */ @@ -349,8 +348,8 @@ tap_dev_stop(struct rte_eth_dev *dev) struct pmd_internals *internals = dev->data->dev_private; for (i = 0; i < internals->nb_queues; i++) - if (internals->fds[i] != -1) - close(internals->fds[i]); + if (internals->rxq[i].fd != -1) + close(internals->rxq[i].fd); tap_link_set_down(dev); } @@ -583,7 +582,6 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, if (fd == -1) return -1; - internals->fds[rx_queue_id] = fd; RTE_LOG(INFO, PMD, "RX TAP device name %s, qid %d on fd %d\n", internals->name, rx_queue_id, internals->rxq[rx_queue_id].fd); @@ -720,7 +718,6 @@ eth_dev_tap_create(const char *name, char *tap_name) /* Presetup the fds to -1 as being not working */ for (i = 1; i < RTE_PMD_TAP_MAX_QUEUES; i++) { - pmd->fds[i] = -1; pmd->rxq[i].fd = -1; pmd->txq[i].fd = -1; } @@ -728,7 +725,6 @@ eth_dev_tap_create(const char *name, char *tap_name) /* Take the TUN/TAP fd and place in the first location */ pmd->rxq[0].fd = fd; pmd->txq[0].fd = fd; - pmd->fds[0] = fd; if (pmd_mac_address(fd, dev, &pmd->eth_addr) < 0) { RTE_LOG(ERR, PMD, "Unable to get MAC address\n"); @@ -849,8 +845,8 @@ rte_pmd_tap_remove(const char *name) internals = eth_dev->data->dev_private; for (i = 0; i < internals->nb_queues; i++) - if (internals->fds[i] != -1) - close(internals->fds[i]); + if (internals->rxq[i].fd != -1) + close(internals->rxq[i].fd); rte_free(eth_dev->data->dev_private); rte_free(eth_dev->data);