From: Pascal Mazon <pascal.mazon@6wind.com>
Date: Fri, 12 May 2017 13:01:38 +0000 (+0200)
Subject: net/tap: drop unnecessary nested block
X-Git-Tag: spdx-start~3170
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b32105eb1f1188723a208e9a0f2a6b4ecfb23e84;p=dpdk.git

net/tap: drop unnecessary nested block

This is cosmetic; the code is functionally equivalent.

Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
---

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 5b99a812fd..91a957edb3 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;
-				}
-			}
 		}
 	}