From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pascal Mazon Subject: Re: [PATCH 3/5] net/tap: remove redundant fds array Date: Fri, 3 Feb 2017 10:38:42 +0100 Message-ID: <20170203103842.2af1e8e9@paques.dev.6wind.com> References: <20170202223330.39240-1-keith.wiles@intel.com> <20170202223330.39240-3-keith.wiles@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: dev@dpdk.org To: Keith Wiles Return-path: Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com [74.125.82.49]) by dpdk.org (Postfix) with ESMTP id A7727282 for ; Fri, 3 Feb 2017 10:38:52 +0100 (CET) Received: by mail-wm0-f49.google.com with SMTP id r141so18884559wmg.1 for ; Fri, 03 Feb 2017 01:38:52 -0800 (PST) In-Reply-To: <20170202223330.39240-3-keith.wiles@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Thu, 2 Feb 2017 16:33:28 -0600 Keith Wiles wrote: > 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 9ed7a87..6673182 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 */ @@ -350,8 +349,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"); > @@ -851,8 +847,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); Acked-by: Pascal Mazon