[dpdk-dev] [PATCH 3/5] net/tap: drop unnecessary nested block

[Pascal Mazon]

This is cosmetic; the code is functionally equivalent.

Signed-off-by: Pascal Mazon <pascal.ma...@6wind.com>
---
 drivers/net/tap/rte_eth_tap.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c9d107c25ac2..770f08ce12f5 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -826,28 +826,24 @@ tap_setup_queue(struct rte_eth_dev *dev,
        struct tx_queue *tx = &internals->txq[qid];
        int fd;
 
-       fd = rx->fd;
-       if (fd < 0) {
-               fd = tx->fd;
+       if (rx->fd == -1 || tx->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;
-                               }
-                       }
                }
        }
 
-- 
2.12.0.306.g4a9b9b3