From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <dev-bounces@dpdk.org> Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6B79BA04B5; Tue, 12 Jan 2021 23:41:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DAE6A140D29; Tue, 12 Jan 2021 23:41:57 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 24338140D23 for <dev@dpdk.org>; Tue, 12 Jan 2021 23:41:56 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 4A60F20B6C40; Tue, 12 Jan 2021 14:41:55 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4A60F20B6C40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1610491315; bh=JCAgB2cYq8A8Amo48jq/rw6hfpbK/nEfm/6r1pH/3+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FFPuPKLeOxGMq85e2NvK1Jx1qoRIBLPf2Plu4/bp+xQYBAYBeFk6SHCwbzuq9eRcH 3S58CbG8eRrdHTFgu9mh5tUPaPXejWuMU4FdwF8br3zdns81lI9KdwfS0sNc+BvShT YhxYsje/Gyf+4yUHNjgI0lPy0Lb+OboC7ym/Nxbs= From: Tyler Retzlaff <roretzla@linux.microsoft.com> To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com Date: Tue, 12 Jan 2021 14:41:51 -0800 Message-Id: <1610491311-4079-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610490821-2938-1-git-send-email-roretzla@linux.microsoft.com> References: <1610490821-2938-1-git-send-email-roretzla@linux.microsoft.com> Subject: [dpdk-dev] [PATCH v2] bus/pci/windows: guard against sdk/dpdk guid collision X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org> DEVCLASS and DEVINTERFACE guids are defined/managed by the windows platform sdk headers. * hide dpdk defined GUID_DEVCLASS_NETUIO and GUID_DEVINTERFACE_NETUIO if the NTDDI_VERSION >= 0x0A00000A * include <ndisguid.h> for windows sdk defined GUID_DEVINTERFACE_NETUIO Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com> --- drivers/bus/pci/windows/pci_netuio.c | 2 ++ drivers/bus/pci/windows/pci_netuio.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c index 670194839..e2bf45724 100644 --- a/drivers/bus/pci/windows/pci_netuio.c +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -7,6 +7,8 @@ #include <rte_log.h> #include <rte_eal.h> +#include <ndisguid.h> + #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..f72c6cc38 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