* [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition
@ 2017-04-06 10:00 Pascal Mazon
2017-04-06 14:07 ` Thomas Monjalon
2017-04-06 14:18 ` [dpdk-dev] [PATCH v2] " Pascal Mazon
0 siblings, 2 replies; 4+ messages in thread
From: Pascal Mazon @ 2017-04-06 10:00 UTC (permalink / raw)
To: dev; +Cc: pascal.mazon
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition
2017-04-06 10:00 [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition Pascal Mazon
@ 2017-04-06 14:07 ` Thomas Monjalon
2017-04-06 14:18 ` [dpdk-dev] [PATCH v2] " Pascal Mazon
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2017-04-06 14:07 UTC (permalink / raw)
To: Pascal Mazon; +Cc: dev
2017-04-06 12:00, Pascal Mazon:
> Fixes: cf5643661161 ("net/tap: move private elements to external header")
>
> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
Please, could you describe the bug briefly?
I know it is a build error. In this case, a log is appreciated.
Why have I not seen the build issue? Is it specific to a compiler?
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH v2] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition
2017-04-06 10:00 [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition Pascal Mazon
2017-04-06 14:07 ` Thomas Monjalon
@ 2017-04-06 14:18 ` Pascal Mazon
2017-04-06 14:28 ` Thomas Monjalon
1 sibling, 1 reply; 4+ messages in thread
From: Pascal Mazon @ 2017-04-06 14:18 UTC (permalink / raw)
To: thomas.monjalon; +Cc: dev, Pascal Mazon
This macro was defined twice.
On machines with kernel < 3.8, IFF_MULTI_QUEUE didn't exist, and thus
both definitions used different values.
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition
2017-04-06 14:18 ` [dpdk-dev] [PATCH v2] " Pascal Mazon
@ 2017-04-06 14:28 ` Thomas Monjalon
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2017-04-06 14:28 UTC (permalink / raw)
To: Pascal Mazon; +Cc: dev
2017-04-06 16:18, Pascal Mazon:
> This macro was defined twice.
> On machines with kernel < 3.8, IFF_MULTI_QUEUE didn't exist, and thus
> both definitions used different values.
>
> Fixes: cf5643661161 ("net/tap: move private elements to external header")
>
> Signed-off-by: Pascal Mazon <pascal.mazon@6wind.com>
Applied, thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-06 14:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-06 10:00 [dpdk-dev] [PATCH] net/tap: fix RTE_PMD_TAP_MAX_QUEUES redefinition Pascal Mazon
2017-04-06 14:07 ` Thomas Monjalon
2017-04-06 14:18 ` [dpdk-dev] [PATCH v2] " Pascal Mazon
2017-04-06 14:28 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).