From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pascal.mazon@6wind.com>
Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com
 [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id F3A07201
 for <dev@dpdk.org>; Thu,  6 Apr 2017 12:00:18 +0200 (CEST)
Received: from 6wind.com (unknown [10.16.0.184])
 by proxy.6wind.com (Postfix) with SMTP id 9E933252CD;
 Thu,  6 Apr 2017 12:00:12 +0200 (CEST)
Received: by 6wind.com (sSMTP sendmail emulation);
 Thu, 06 Apr 2017 12:00:10 +0200
From: Pascal Mazon <pascal.mazon@6wind.com>
To: dev@dpdk.org
Cc: pascal.mazon@6wind.com
Date: Thu,  6 Apr 2017 12:00:08 +0200
Message-Id: <435e323dd3883c32d62590b633f6d1095599f270.1491469372.git.pascal.mazon@6wind.com>
X-Mailer: git-send-email 2.12.0.306.g4a9b9b3
Subject: [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Apr 2017 10:00:19 -0000

Fixes: cf5643661161 ("net/tap: move private elements to external header")

Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
---
 drivers/net/tap/rte_eth_tap.c | 6 ------
 drivers/net/tap/rte_eth_tap.h | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 832186344047..70cf9eb8d35f 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -72,12 +72,6 @@
 #define ETH_TAP_SPEED_ARG       "speed"
 #define ETH_TAP_REMOTE_ARG      "remote"
 
-#ifdef IFF_MULTI_QUEUE
-#define RTE_PMD_TAP_MAX_QUEUES	16
-#else
-#define RTE_PMD_TAP_MAX_QUEUES	1
-#endif
-
 #define FLOWER_KERNEL_VERSION KERNEL_VERSION(4, 2, 0)
 #define FLOWER_VLAN_KERNEL_VERSION KERNEL_VERSION(4, 9, 0)
 
diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index f1496dcfdb1a..ad497b3d1015 100644
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -43,7 +43,11 @@
 #include <rte_ethdev.h>
 #include <rte_ether.h>
 
-#define RTE_PMD_TAP_MAX_QUEUES 16
+#ifdef IFF_MULTI_QUEUE
+#define RTE_PMD_TAP_MAX_QUEUES	16
+#else
+#define RTE_PMD_TAP_MAX_QUEUES	1
+#endif
 
 struct pkt_stats {
 	uint64_t opackets;              /* Number of output packets */
-- 
2.12.0.306.g4a9b9b3