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 A66CCA0579; Thu, 8 Apr 2021 13:26:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61B4E40698; Thu, 8 Apr 2021 13:26:02 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 9385940138 for <dev@dpdk.org>; Thu, 8 Apr 2021 13:26:01 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id b9so1751630wrs.1 for <dev@dpdk.org>; Thu, 08 Apr 2021 04:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=hpzIn6p76CwtG2N/etqFN2nfvh0xOdXXDW2SUOLXNGE=; b=E0iFiMtf42B6KYjJC8FUuJFjpcrwXV4m8ksezpg/fQCyJDFjNcDdED8E8KnmdhUt8G N+ZcPcr1SMPbk707BziQWIJtF3YgFQznV/eZWqY5kltJMdKEh33DKfeHea4t73h9c5Sy BwLunuo+AbI1fMwCF3xM3WmDkVO+VThAZhbEjsctHN13fN6SIe72qsKiSktzWX3VZ/eN zc4YqVm1ncA5OT1B3dgoffgP0/mnwxQtq3xTA0tTFA7RkoDVfWym0qI6ZaCFUHUOzipH fza9BtQTpdk2re/jVQx7M7aWRbOF/e5mQUuPUCN3d+E23ootizjRZEAuyO0EjJbg0/vQ ze1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=hpzIn6p76CwtG2N/etqFN2nfvh0xOdXXDW2SUOLXNGE=; b=W5B7opDE6Ek5ppGGQGQXU5+5JEysAgMUwc3+m+3bmFMUYEVNCDfX+oyH6Yf8M94fxm x+xaT9BwyCf2gUAHI54BE91f258fIFGiwCOtcUrdunmqVzlh/o6yLqc6KTFL8EQl/p9R hcqmgmiDbK4ygIqo2EZzKZYJO51/m/0bIH+dYS76oCD+EVhHz4q8T9/o9ixrZ9Ny1j4u gnbd8tz3p5AHCUf5jwXFjFL2z9jC4warvAuvv+4rZJzBeKvaPx6s92pbG+bd6+tz7PvX oC3eymn7o3l6j1+/Fesd/rVSpaNUKFxRmH2hyApMPSRRQZvJ8Yy+dTnlr0uVaVP6EPOD eWtQ== X-Gm-Message-State: AOAM531IKi+/DJxPTK0kwH258yLZDTj83zveQCh8f1knLlJoYtoV6OwR VWpIzwN38bcZOC7vDFjsYOLbZw== X-Google-Smtp-Source: ABdhPJzzVN/xv+JIpA03jENMgGBPQeiWP63R8zT2airZYDshKGUYOWv0gAdVMwpE5YNuJQAFWsSEmA== X-Received: by 2002:adf:e541:: with SMTP id z1mr10197179wrm.383.1617881161379; Thu, 08 Apr 2021 04:26:01 -0700 (PDT) Received: from 6wind.com ([2a01:e0a:5ac:6460:c065:401d:87eb:9b25]) by smtp.gmail.com with ESMTPSA id w7sm21009834wrt.15.2021.04.08.04.26.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 04:26:00 -0700 (PDT) Date: Thu, 8 Apr 2021 13:26:00 +0200 From: Olivier Matz <olivier.matz@6wind.com> To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> Cc: dev@dpdk.org, Tyler Retzlaff <roretzla@linux.microsoft.com>, Jie Zhou <jizh@linux.microsoft.com>, Nick Connolly <nick.connolly@mayadata.io>, Ranjit Menon <ranjit.menon@intel.com> Message-ID: <20210408112600.GU1650@platinum> References: <20210403234129.20296-1-dmitry.kozliuk@gmail.com> <20210407222249.6729-1-dmitry.kozliuk@gmail.com> <20210407222249.6729-4-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210407222249.6729-4-dmitry.kozliuk@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-dev] [PATCH v8 3/4] net: work around s_addr macro on Windows 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> On Thu, Apr 08, 2021 at 01:22:48AM +0300, Dmitry Kozlyuk wrote: > Windows Sockets headers contain `#define s_addr S_un.S_addr`, which > conflicts with definition of `s_addr` field of `struct rte_ether_hdr`. > Prieviously `s_addr` was undefined in <rte_ether.h>, which had been > breaking access to `s_addr` field of `struct in_addr`, so some DPDK > and Windows headers could not be included in one file. > > Renaming of `struct rte_ether_hdr` is planned: > https://mails.dpdk.org/archives/dev/2021-March/201444.html > > Temporarily disable `s_addr` macro around `struct rte_ether_hdr` > definition to avoid conflict. Place source MAC address in both `s_addr` > and `S_un.S_addr` fields, so that access works either directly or > through the macro as defined in Windows headers. > > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com> > Acked-by: Ranjit Menon <ranjit.menon@intel.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>