From patchwork Fri May 12 13:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Mazon X-Patchwork-Id: 24274 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 40EDC689E; Fri, 12 May 2017 15:02:24 +0200 (CEST) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 51A6E2E83 for ; Fri, 12 May 2017 15:02:18 +0200 (CEST) Received: from 6wind.com (unknown [10.16.0.184]) by proxy.6wind.com (Postfix) with SMTP id 7A882246E0; Fri, 12 May 2017 15:02:11 +0200 (CEST) Received: by 6wind.com (sSMTP sendmail emulation); Fri, 12 May 2017 15:02:13 +0200 From: Pascal Mazon To: ferruh.yigit@intel.com, dev@dpdk.org Cc: pascal.mazon@6wind.com Date: Fri, 12 May 2017 15:01:38 +0200 Message-Id: <26e848f75b1fd23bddfe25a3b1edec33afe3bf64.1494593926.git.pascal.mazon@6wind.com> X-Mailer: git-send-email 2.12.0.306.g4a9b9b3 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 3/5] net/tap: drop unnecessary nested block 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" This is cosmetic; the code is functionally equivalent. Signed-off-by: Pascal Mazon --- drivers/net/tap/rte_eth_tap.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 5b99a812fda0..91a957edb333 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -825,30 +825,26 @@ tap_setup_queue(struct rte_eth_dev *dev, struct pmd_internals *pmd = dev->data->dev_private; struct rx_queue *rx = &internals->rxq[qid]; struct tx_queue *tx = &internals->txq[qid]; - int fd; + int fd = rx->fd == -1 ? tx->fd : rx->fd; - fd = rx->fd; - if (fd < 0) { - fd = tx->fd; + if (fd == -1) { + RTE_LOG(INFO, PMD, "Add queue to TAP %s for qid %d\n", + pmd->name, qid); + fd = tun_alloc(pmd, qid); if (fd < 0) { - RTE_LOG(INFO, PMD, "Add queue to TAP %s for qid %d\n", + RTE_LOG(ERR, PMD, "tun_alloc(%s, %d) failed\n", pmd->name, qid); - fd = tun_alloc(pmd, qid); - if (fd < 0) { - RTE_LOG(ERR, PMD, "tun_alloc(%s, %d) failed\n", - pmd->name, qid); + return -1; + } + if (qid == 0) { + struct ifreq ifr; + + ifr.ifr_mtu = dev->data->mtu; + if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, + LOCAL_AND_REMOTE) < 0) { + close(fd); return -1; } - if (qid == 0) { - struct ifreq ifr; - - ifr.ifr_mtu = dev->data->mtu; - if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1, - LOCAL_AND_REMOTE) < 0) { - close(fd); - return -1; - } - } } }