* [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253
[not found] <1610491311-4079-1-git-send-email-roretzla@linux.microsoft.com>
@ 2021-01-14 21:22 ` Tyler Retzlaff
2021-01-14 22:06 ` Dmitry Kozlyuk
2021-01-14 22:59 ` Ranjit Menon
0 siblings, 2 replies; 4+ messages in thread
From: Tyler Retzlaff @ 2021-01-14 21:22 UTC (permalink / raw)
To: dev; +Cc: stable, dmitry.kozliuk
NetUIO device class and interface GUIDs are defined in system
headers starting from platform SDK v10.0.20253. Inspect SDK
version to avoid redefinition.
Pre-release SDKs do not promise compatibility and a narrow
subset of SDKs may still be subject to redefinition.
Fixes: c76ec01b4591 (bus/pci: support netuio on Windows)
Cc: stable@dpdk.org
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
drivers/bus/pci/windows/pci_netuio.c | 6 ++++++
drivers/bus/pci/windows/pci_netuio.h | 2 ++
2 files changed, 8 insertions(+)
diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c
index 670194839..1bf9133f7 100644
--- a/drivers/bus/pci/windows/pci_netuio.c
+++ b/drivers/bus/pci/windows/pci_netuio.c
@@ -7,6 +7,12 @@
#include <rte_log.h>
#include <rte_eal.h>
+#ifdef __MINGW32__
+#include <ddk/ndisguid.h>
+#else
+#include <ndisguid.h>
+#endif
+
#include "private.h"
#include "pci_netuio.h"
diff --git a/drivers/bus/pci/windows/pci_netuio.h b/drivers/bus/pci/windows/pci_netuio.h
index 9a77806b5..2f6c97ea7 100644
--- a/drivers/bus/pci/windows/pci_netuio.h
+++ b/drivers/bus/pci/windows/pci_netuio.h
@@ -5,6 +5,7 @@
#ifndef _PCI_NETUIO_H_
#define _PCI_NETUIO_H_
+#if !defined(NTDDI_WIN10_FE) || NTDDI_VERSION < NTDDI_WIN10_FE
/* GUID definition for device class netUIO */
DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28,
0xa3, 0x29, 0xf3, 0x22, 0xeb, 0xad, 0xbe, 0x0f);
@@ -12,6 +13,7 @@ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28,
/* GUID definition for the netuio device interface */
DEFINE_GUID(GUID_DEVINTERFACE_NETUIO, 0x08336f60, 0x0679, 0x4c6c,
0x85, 0xd2, 0xae, 0x7c, 0xed, 0x65, 0xff, 0xf7);
+#endif
/* IOCTL code definitions */
#define IOCTL_NETUIO_MAP_HW_INTO_USERSPACE \
--
2.29.0.vfs.0.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253
2021-01-14 21:22 ` [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253 Tyler Retzlaff
@ 2021-01-14 22:06 ` Dmitry Kozlyuk
2021-01-15 13:50 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
2021-01-14 22:59 ` Ranjit Menon
1 sibling, 1 reply; 4+ messages in thread
From: Dmitry Kozlyuk @ 2021-01-14 22:06 UTC (permalink / raw)
To: Tyler Retzlaff; +Cc: dev, stable
On Thu, 14 Jan 2021 13:22:35 -0800, Tyler Retzlaff wrote:
> NetUIO device class and interface GUIDs are defined in system
> headers starting from platform SDK v10.0.20253. Inspect SDK
> version to avoid redefinition.
>
> Pre-release SDKs do not promise compatibility and a narrow
> subset of SDKs may still be subject to redefinition.
>
> Fixes: c76ec01b4591 (bus/pci: support netuio on Windows)
> Cc: stable@dpdk.org
>
> Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253
2021-01-14 21:22 ` [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253 Tyler Retzlaff
2021-01-14 22:06 ` Dmitry Kozlyuk
@ 2021-01-14 22:59 ` Ranjit Menon
1 sibling, 0 replies; 4+ messages in thread
From: Ranjit Menon @ 2021-01-14 22:59 UTC (permalink / raw)
To: Tyler Retzlaff, dev; +Cc: stable, dmitry.kozliuk
On 1/14/2021 1:22 PM, Tyler Retzlaff wrote:
> NetUIO device class and interface GUIDs are defined in system
> headers starting from platform SDK v10.0.20253. Inspect SDK
> version to avoid redefinition.
>
> Pre-release SDKs do not promise compatibility and a narrow
> subset of SDKs may still be subject to redefinition.
>
> Fixes: c76ec01b4591 (bus/pci: support netuio on Windows)
> Cc: stable@dpdk.org
>
> Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
> ---
> drivers/bus/pci/windows/pci_netuio.c | 6 ++++++
> drivers/bus/pci/windows/pci_netuio.h | 2 ++
> 2 files changed, 8 insertions(+)
>
Acked-by: Ranjit Menon <ranjit.menon@intel.com>
Quick q: Do you know when this new SDK will be available publicly?
ranjit m.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [dpdk-dev] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253
2021-01-14 22:06 ` Dmitry Kozlyuk
@ 2021-01-15 13:50 ` Thomas Monjalon
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Monjalon @ 2021-01-15 13:50 UTC (permalink / raw)
To: Tyler Retzlaff; +Cc: dev, stable, Dmitry Kozlyuk
14/01/2021 23:06, Dmitry Kozlyuk:
> On Thu, 14 Jan 2021 13:22:35 -0800, Tyler Retzlaff wrote:
> > NetUIO device class and interface GUIDs are defined in system
> > headers starting from platform SDK v10.0.20253. Inspect SDK
> > version to avoid redefinition.
> >
> > Pre-release SDKs do not promise compatibility and a narrow
> > subset of SDKs may still be subject to redefinition.
> >
> > Fixes: c76ec01b4591 (bus/pci: support netuio on Windows)
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
>
> Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Applied, thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-15 13:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1610491311-4079-1-git-send-email-roretzla@linux.microsoft.com>
2021-01-14 21:22 ` [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253 Tyler Retzlaff
2021-01-14 22:06 ` Dmitry Kozlyuk
2021-01-15 13:50 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
2021-01-14 22:59 ` Ranjit Menon
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).