From patchwork Sun Feb 6 03:58:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106904 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 590A0A034E; Sun, 6 Feb 2022 04:59:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8B5B4069D; Sun, 6 Feb 2022 04:59:01 +0100 (CET) Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by mails.dpdk.org (Postfix) with ESMTP id 3D0DF40042 for ; Sun, 6 Feb 2022 04:58:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119936; bh=pzKhGVdD9gqF86X6mY+zh13WGO5IwL8BNRIIiY+2tXo=; h=From:To:Subject:Date; b=MQaCWaGCze0Zx4lAYNbxP9rpWCA61KbZ1eUoIK1uYwDQrjbLWbBb0PJQ+invf32uq OZwZwIp9SBbbwQEyAl6gK3LU/MHzVz5dVC/JNTxxct7713b3pRv1FsgARS1DEhwIi4 kxhSnb1HhGT1yo6wyzN7K8ZFD7PArQZfBNDO+AyE= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119926tes62v34r Message-ID: X-QQ-XMAILINFO: NzOHSugmTg7XgVgLxEa8YN5wZaRgpSFOSRgu71QDj19MuK8vgm30aQIcIGRp7I RBLT4h34L7XpU2nLqiDcwLHZodwOiMMstaewoBptZ/X9N5PLY5j1WetIDnSV/yAmPOJdRuzVyNgY RMMFomSmYR6pt/wmIK6Ftm8stJX/kl2Kfh8HvevgoMk/pHKml+RotQM8YeF6dlA7PhOW8x02dBoQ /mV0OMcNu/LU34QB7gmUJgoo/kixMCRKKKmVn6WbPAcbrfAoIurmakIzqdluRR57QOn7TQm2iCNB vZFhTcnK7WNxArekDzVdCdq/8EiSplu+GBhpZvJEnFSC6Uye78ZVbktHkF/lYl7fAwirZHLAfI9I Kjjq5cBaiddsfmqVEiFjLFjrzRWH4AtAKCik46fZI2u1pmL6LfCDNoJmi06/Of1D2mtRcFq6/crJ Uy+7cRCIYKDf365iPJVHQM5FKNmNmrGeT9Wnxo5HNvOcsFcWjxXC9N3o0M1HP70SLRUfCtzeZoSn jIsOBJZ2akbrGl9ItV4vIb4rhV65UoVzzyKUj9Jcawdixx4F3auxZQruzuLVNvdPH1Aq5wguI6K0 E92yGvX1LihMATvYdJc1Ova+xCL3UiPDq2b3/LpBKJPPbF9CQmNh5AycKCebVzNz5JqOWU63246p G/nYfLYvXa6wyjnmPJcx+BZ2B8ZaarfsCgmXpKiVIbYpnMV676xzh3oATQWTvtJuSwQK/SRnqNA2 oR8dFOCAdnvqBrntQVBowZ2yrnZLE5ljwWdXNIEq0I33Rjws6vPgELxQ8NQJcV2sdLH+5ZlklUnd QGpT83uSuTKYChyEW/efV6n0XFxMNtfozCX8d+YhEnto34SoFfhoXAlKEiQtHxyUf0Mga7kOlQoQ == From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 01/16] bus/dpaa: add define guards to avoid multiple inclusion Date: Sun, 6 Feb 2022 11:58:31 +0800 X-OQ-MSGID: <20220206035846.2840462-1-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/bus/dpaa/base/qbman/qman.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/bus/dpaa/base/qbman/qman.h b/drivers/bus/dpaa/base/qbman/qman.h index 4346d86537..19be738424 100644 --- a/drivers/bus/dpaa/base/qbman/qman.h +++ b/drivers/bus/dpaa/base/qbman/qman.h @@ -5,6 +5,9 @@ * */ +#ifndef _QBMAN_QMAN_H_ +#define _QBMAN_QMAN_H_ + #include "qman_priv.h" /***************************/ @@ -911,3 +914,5 @@ static inline void __qm_isr_write(struct qm_portal *portal, enum qm_isr_reg n, __qm_out(&portal->addr, QM_REG_ISR + (n << 2), val); #endif } + +#endif /* _QBMAN_QMAN_H_ */ From patchwork Sun Feb 6 03:58:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106906 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B7AAFA034E; Sun, 6 Feb 2022 04:59:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2B6D41101; Sun, 6 Feb 2022 04:59:03 +0100 (CET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by mails.dpdk.org (Postfix) with ESMTP id EC03B40042 for ; Sun, 6 Feb 2022 04:59:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119937; bh=WmAaDGeNKhT6tYVk1j5aH1MUnOmEBRhLDKlJ8rxovlo=; h=From:To:Subject:Date:In-Reply-To:References; b=eaB7fDl2godNPJPMmM+CqpwskKlRKu6UPLipTMoX1xw06i8cYiNYdjRj7MZ9B37ES kskG8eySnDEHRlI1YFQ9SMpF3qSpMNCYX0vHnFi1+HLKWdszH88X1JSMq/ECcMB8GW XTGn7kC9FoHr37/W4w8EGgPKRSov6D3wGlYWJ1tw= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119936t49ogu52u Message-ID: X-QQ-XMAILINFO: Mb3mLQ2ErcSXoezV//XKCpQnrCVPPV6N7KHge6uUFavO6qkspdqc29qUcP2vBr 7z3tYY+f+kYolBwkDB4VRZG/kqwk5RIZoYHc42fgJOlFDSffDzcJzGTjO4SDh9dxm0IqAvWoZC9o MGn9kmOgPSOXbfehZKOAeUfSyCG8+QdIHhMGSH/V+bFba0fifFzxEmV/+HFcR5NTd7BZ343tn9+0 v7dhyPvaJ5g/ESEo3S3DQm1YjQpqrweBjKbG8jkBg0Nc6oMIJ2a7DfLbg3meRayGt+UDIGdZsy+v /huRTruqGbDxkWFsTxDYIgLKQiggAZwqtDTjG3KengK03BXSOwiAscCSwvN7CDe+ey+k2E5tXJI2 31801aDG241CXiMnynUPJiNi37eBOHHdhQUnrke4T9Ti23K7HTR9G8BYEW3JwoQnp/afuFFo6IPc AEzHavCAZkhU4X2/IrEEmd1nBi7keAswknwm8j2SxQIc7Hfh1AA+TfDkH/B81Z2T+vZ+/jzdwysQ +/ClcKTA2wE8m/n/Gj5TOdxORHVLrTY0jXnomFBa3aVoI+yfI8NlN1gvEyu3jcB/TWBkyUSvbEhC sgs0nbf7CTqXOOf8LsN9C5Qy1U97LOwv8af0ZAPW8JP3ShRlxNEjdyDV7WS5YMiEskdegdKSnrhg OtUZomFdmnzke9mvswy8Qs+fw9mIlW0Ervw+zlCy0eBBj5bAeA2YKHOeyLV9/HYXopPto08wLbKM QiJFcei8XmWP0fLbbdvIrjkQ+/t8tEEWeI510Y6Qbui1+9AbaASnZDJDZ00EuWRkRraRcs0r6weI lsZuFRgJfyGbis2AB7MKEnWzJf0tRzPpEz7dS3X2g0lVIHpxJ7mrZKNYytzkuEErO9EQd6MsLNCx jiV7ST6vO+1Ku8kClhHpU= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 02/16] event/octeontx: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:32 +0800 X-OQ-MSGID: <20220206035846.2840462-2-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/event/octeontx/timvf_worker.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/event/octeontx/timvf_worker.h b/drivers/event/octeontx/timvf_worker.h index 3f1e77f1d1..a99ff54245 100644 --- a/drivers/event/octeontx/timvf_worker.h +++ b/drivers/event/octeontx/timvf_worker.h @@ -2,6 +2,9 @@ * Copyright(c) 2017 Cavium, Inc */ +#ifndef __TIMVF_WORKER_H__ +#define __TIMVF_WORKER_H__ + #include #include @@ -443,3 +446,5 @@ timvf_add_entry_brst(struct timvf_ring * const timr, const uint16_t rel_bkt, timr_bkt_dec_lock(bkt); return nb_timers; } + +#endif /* __TIMVF_WORKER_H__ */ From patchwork Sun Feb 6 03:58:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106905 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6979CA034E; Sun, 6 Feb 2022 04:59:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBD39410EC; Sun, 6 Feb 2022 04:59:02 +0100 (CET) Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by mails.dpdk.org (Postfix) with ESMTP id A20E74069D for ; Sun, 6 Feb 2022 04:59:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119938; bh=LcAAjs3+Ew6ZBmPoP6FiikQHx89OqTvb4UH9LwF7uGI=; h=From:To:Subject:Date:In-Reply-To:References; b=Z4AHgyVQodd9LrFD6Mz4KgUzjiYsUGQCikmCPk0jkxPaMBAAKXMIX1EgkD5I3h8YI D1pyJ3ad+iB+/38JlIpQBJ84Olqy1IvJ6Dun+pJUpr5QxeFvp2s5rSR6aOehi1ipXs WjcnUpJxeBv9kyDFE2vMfTOOXzBjamqajA9nK/AA= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119937tc7fod24y Message-ID: X-QQ-XMAILINFO: OE2SNMSfMbmOIVesbVrsq4wd7EZeiAnygS4k0GMh2SCIOc82mKhMMQ0Uq97a/l ZD878verZ22IJ6Ob7eKDdX9LnxszuAiku3/SZqS2bG+9Hhil7t2YB8Legx7nOE5xwYqgD6vUdvrW Bpr2UUesAAewRFwJmpiozYL5xXJ95gG/6Hg0djpzymX2sKyHzDh9lClFqmOCJTUz8Xr0MVcg5BdY S8RHZji8gq7UwRWyUergOv3foivaDIS001Q32prTvWwMXkQs2XUTDcpj2lmb+q6OFce6iFc6wlxf Z1zJ2jreRVOFZrGiMHwUcF7TLoXMWSjIKEzJiBFUfsSzluiLeGbXUGrvQkjWLpaS/vvuQJT/8B+I qEyf48y7nACIOdOwFwceph/cz5fZKKuQQa0b3yKyJAMLvgMJHt0vkrWb2h7nYO8xct5oka2taANu Z7/t3A8zwSRQPt+wjgyp30ENYlndRV/eJ55Vxq4RM75BZAMeDLw8IbOLfq9QNjPIQU3BpYYGivq/ RqC+K2CIfxAWkL2scogjFrcB35FSJ9b/Se4xCa6dsgtpxEJTpZbPxoeueQAMszR1hXtyO5zxxggC xBdUWXuUBWOpO77w3CbIzqDFFtcCwmR98/k2kFIaszutFTX36GsVjkc7a4zZXIiLIm3eTJ80zwrB PHyIHqb0Hi3rn7cVnCMFPTljwfOPzv6e70prkXXYXSl0U8YBgAdp0FUo7kiffZdB5Jk57GrrXeCr dZME2dcITH14Bzo5rQmGhWwNrh9f6erf9gWEKvOsttnwMR8pWV7TMtDZ7Ri5VWYboorqA2JSygGt pGRfhUg5MKgvtOVvvw8+rRfupAO8DBQRB0Fm9vqUJpWQYDqI9grmJgol4XzeGcq6c8h0jSgiye4u e5RWRhAkNq From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 03/16] net/cxgbe: add define guards to avoid multiple inclusion Date: Sun, 6 Feb 2022 11:58:33 +0800 X-OQ-MSGID: <20220206035846.2840462-3-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/cxgbe/base/t4_regs.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/cxgbe/base/t4_regs.h b/drivers/net/cxgbe/base/t4_regs.h index 8a14d09a15..4952f7cde4 100644 --- a/drivers/net/cxgbe/base/t4_regs.h +++ b/drivers/net/cxgbe/base/t4_regs.h @@ -3,6 +3,9 @@ * All rights reserved. */ +#ifndef _CXGBE_T4_REGS_H_ +#define _CXGBE_T4_REGS_H_ + #define MYPF_BASE 0x1b000 #define MYPF_REG(reg_addr) (MYPF_BASE + (reg_addr)) @@ -976,3 +979,5 @@ #define LE_3_DB_HASH_MASK_GEN_IPV4_T6_A 0x19eac #define LE_4_DB_HASH_MASK_GEN_IPV4_T6_A 0x19eb0 + +#endif /* _CXGBE_T4_REGS_H_ */ From patchwork Sun Feb 6 03:58:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106908 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D84DA034E; Sun, 6 Feb 2022 04:59:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F01F4114B; Sun, 6 Feb 2022 04:59:05 +0100 (CET) Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by mails.dpdk.org (Postfix) with ESMTP id C8AAB406A2 for ; Sun, 6 Feb 2022 04:59:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119938; bh=KvNMi2P6ykASmo0g3Tsva7V1oGPRvx4JGFXOSWgL98g=; h=From:To:Subject:Date:In-Reply-To:References; b=DQ+6F8N7Hfr+LHF27mA4GKdj5wheLdZl1zYdpIHqhPd122SNFn0KUdX0nqpKOlkUI Pvel3hTDFdeC+msj7OlMMKPSgD0stfNgXFn57VtM553vSitph8Z2RWqzLRBRLiTPBz VFTSCcSPOduhGPXBG4LLA9ZJ8xlYwRGrwaFywN9M= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119938t5pmpisr8 Message-ID: X-QQ-XMAILINFO: M2CfHm1q8SPriAfemtWtXOuRViDaz4yI6lR2eTBxXvIAJFsrgPv1A290m7RDaP CYfyAZ7QOaXwzMMyI1ERQ1rlFHds1FNnSLwa6bpKwAvXg39EnJ0HbSAuJCoUWQ2duRhGLVNx1JxS VdV9GJ7HV/QBZKL2kA8PfT+PLC8stDKINovI6x1FWTs9qhjUhhQpFhNV8kVtzTo9kQ1jfFf2zedq oZ0Ozac4rc8wLASymHvVp48foKYHuKoAN8b9qD4iiI7g+vzwIPA/drToCDg/zEQyiwZWUCHCeVj8 W2HapAau6w9GaSVPPFEkoQpmWEbuIZy25hpeLhGOhi34+Z5opSdwOurk1h6OEzNYLyw+2JKogCop /zOz+d2PmPVtqSuTTPck3dQp3oyQx9XLFEaI0hTp1U2BXPXILuQ51wCRDdja11cQ/ar0QTmuSJbg Y7dik2xV7EqnlVSuMYDHUHEEW7CXEQY+8XKrrQNKukfalw4xOGWC7VDt/bk8utjuflIV980CnYjn CI7zHx3K5UPUq70OC6KtxZEftt9q0h0EmW2rmAsGI+eyM6KztLDnVG34uMyrVglcur90a1KLA6np BUmVcPydBldnjMx0mETkZwH3m07xVXH04Gn6Lt5D0DHzhrWtQp8o3UefEUJRDurU2i9O2X2zrgXR Cg4gLKi72X1Z+PMWFsjR9vdgp2sXY+Fw5L2XYddLcZ5oHRnIFLkzGCgInAvcnHS7N/dp0t1FnS7E +Tmtw+lxgFlaLf0J1he3NeDM3V1AN7NhkvvZ6+f5ul+RfRJnoqVmIGgNViwlXTAHyR2eYfULUoAi MZsRJwKFWsGDA/grnn41gZlNVDjQrrV+dNsgeiL7/FTFKJNIfmuMWWhrscb+xBuYy4hoKwkeXkNc 2wLypE9Bo7o6n5QPSqDZMQmg4djiaNJQsTfT6SbfAO From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 04/16] net/enetfec: add define guards to avoid multiple inclusion Date: Sun, 6 Feb 2022 11:58:34 +0800 X-OQ-MSGID: <20220206035846.2840462-4-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/enetfec/enet_uio.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/enetfec/enet_uio.h b/drivers/net/enetfec/enet_uio.h index fec8ba6f95..0d5b9e7a39 100644 --- a/drivers/net/enetfec/enet_uio.h +++ b/drivers/net/enetfec/enet_uio.h @@ -2,6 +2,9 @@ * Copyright 2021 NXP */ +#ifndef _ENETFEC_UIO_H_ +#define _ENETFEC_UIO_H_ + #include "enet_ethdev.h" /* Prefix path to sysfs directory where UIO device attributes are exported. @@ -62,3 +65,5 @@ int enetfec_configure(void); int config_enetfec_uio(struct enetfec_private *fep); void enetfec_uio_init(void); void enetfec_cleanup(struct enetfec_private *fep); + +#endif /* _ENETFEC_UIO_H_ */ From patchwork Sun Feb 6 03:58:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106907 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 373FDA034E; Sun, 6 Feb 2022 04:59:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95936410E7; Sun, 6 Feb 2022 04:59:04 +0100 (CET) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by mails.dpdk.org (Postfix) with ESMTP id 13BC040DDB for ; Sun, 6 Feb 2022 04:59:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119939; bh=xGqOgRTvUTlpx2XBSDfj+d32cZhr8hlOBhk3j27lW2Q=; h=From:To:Subject:Date:In-Reply-To:References; b=jOEt0CBRPikq7WJLpmfbVPO5rjz+xmLfoouvYO/Rl1TtLmsFSvj3p1zKrZnb/X0IS gZuWtHVh8CNZhCnFEr9GcY+h1+i9ZcyJEe3TZnDFuEoIWOpq++IayfNkt8b5npOoyW cVz6ZKeiqil3jwu43OTsQxJc0cykdgQdGCU3lzSs= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119938tlocde0rc Message-ID: X-QQ-XMAILINFO: NR+Rloh0s0m60Qg1UsJkjRA7MNVIk/rNGwpOWnrGBzeqRxIaKQmpjfjX8fcADA KGJPmyrZiniDL6Aj93nNxkwI6YGJVeDBdzIMnOKeLvIlANpfpNWiBZELLedge7hQv8bIdhA7/hD/ 065NuI9SdllZ5tllctRVtTw3kWp1gOWh91qB6+0T+Zyo9CFZshLJYbzyuOIm4mK4372hE0CHdHyf 36r3wapw6RvcWII6i5RJJ6hj8zLyBeT+sJcGSwVGh6MUsj3G0HsE10W+nQ78yyszPukgJjKRRFy6 Dt4e6jGny+2G1JvHHbZjWRtX24vhICTSHJoNDhrfzc7Yx6K/0C5WFVMPsVp9bVD+Dm6xAHY++rWL G9bWnXHSIAQYzKiwdae/WlA5XWjSzhauOgCwhju4hQXSLufGsNq9GmLawplfbOl/ufdYVgJgq+iN 2OCFWSogIGQPYYrNsP+RWzaWKoCeEMuJtFNDRtJr/0/jmmLwg36GAJuDo+XG+v6cWfyGih+AAXhE W30NskWJYjndbbo/C1gerFosh3E12pY2Fc1vBEz+NerfVX76nEcCDWEmt9xAB+rGpxGZQvgrF8Sy 26QndTITpkqBz9uvKam5ROO115WIPiNiBk7TO2SycgOG8ljv5tsWpv8I30HJs9nXwIS5DTuOqmds LYwm0sh4O8fziBQjRtwOGQggQzCTvc05Iuj6ogyVlvbtgQo/DAqjr2H78ehPr6wCJp9w+RPAVW5n L55eRvxMmYV2HO9hA+69MrosAuafGOcEa6DY7CQVjvjcCJYNPRHEcmBAFcivDiOa2EVHrXeyaBty lDxTik5XcxvW7tvbdIgq928XssDJOy0qRklTGIOxzs3x7KbRAfaHJt5gA8SZ9v4a88b75d7x39sy U9u+Zvi3YGnzIJrBH7jMVdSn6aIwxZXINCX865XYbV From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 05/16] net/i40e: add define guards to avoid multiple inclusion Date: Sun, 6 Feb 2022 11:58:35 +0800 X-OQ-MSGID: <20220206035846.2840462-5-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/i40e/i40e_regs.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/i40e/i40e_regs.h b/drivers/net/i40e/i40e_regs.h index b19bb1d5a5..b3111dbf96 100644 --- a/drivers/net/i40e/i40e_regs.h +++ b/drivers/net/i40e/i40e_regs.h @@ -2,6 +2,9 @@ * Copyright(c) 2016 Intel Corporation */ +#ifndef _I40E_REGS_H_ +#define _I40E_REGS_H_ + struct i40e_reg_info { uint32_t base_addr; uint32_t count1; @@ -966,3 +969,5 @@ static const struct i40e_reg_info i40e_regs_others[] = { {I40E_GLGEN_STAT_CLEAR, 0, 0, 0, 0, "GLGEN_STAT_CLEAR"}, {0, 0, 0, 0, 0, NULL} }; + +#endif /* _I40E_REGS_H_ */ From patchwork Sun Feb 6 03:58:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106909 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9975CA034E; Sun, 6 Feb 2022 04:59:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA70641154; Sun, 6 Feb 2022 04:59:06 +0100 (CET) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by mails.dpdk.org (Postfix) with ESMTP id 5B063410E7 for ; Sun, 6 Feb 2022 04:59:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119940; bh=TkgPK7e3PAzJFYUivL2s+/vSYoEaF/eGSKlApV0WKBI=; h=From:To:Subject:Date:In-Reply-To:References; b=gy5bWMb/SZyjry8OJsn6W/P1WPNdZOVrhothnsPAf1DxzqYr+IOQf2Y1IsiK1Hcnb zY/SMhAYnZsri3+8n6KRww12qvSSbSsD5IEVFxF5vwN3DQuOISWREm4n/PE+Lz7NeG 2SAk+dLJz3JVsT462KBkILooOdMSevBNgpxexzE0= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119939ta6ydkua4 Message-ID: X-QQ-XMAILINFO: OP+c3nkhx29M0naSHqWrXL3CtR+WMVhdHoKWrzKqL9ZRMZh5yKhIKlNUm8GjHS HW0q1KMn/0brqJx42GShWhz8jxBKNj5/KswYFbBYSzjRWPOKhTuA0GINikcsXOW4IGpvAEVzOeWj UTCYw8ywiFpOCau/pXv1pHV3ZUHxKfpymenzBo7LnCVmvp6PSIwZ5Yb0gc4swW5AKi+u5NG9fSjX YC8CxoFkNbcH+jXfGmygzE+RGDLb6Hk/FMS5DOno4w0q762XsrLSk9N2cnqQflMKHRXhWZA1yOAo /Poj2jBX09nW6U0P+lQwPeHpXcsGePd//rJAxNngWzyEkqdA8ob5b8Q4TPp4MEptHVu6e4FHEcw7 DcvRt+ZpPXVKzaJ1ePoEBCx/lWtbcSHAL4a1T6kkm+4cZhBcz8DTfDL6wb3Wv8wzM+SLbxAEIP17 xegAtPzxV79ygTL3PvHoee3uQ78ErbQhkfBPBQ7S2QbV9cCpCSI+4Q87BQy4tBT5aV85DTx35d1s 8AW67Jfumnvv6JbeCK4dR3KGvRZKQsA69TTnpFzv4vagmqeLrkNrYjjYJY0voGPpmLbugdQEDxq0 ZeXKBMoOewN7LQ3OeY2R4TWnF9/sWFi8cupkN0NBk8cBZEYJF45VCV5HtTPeLSptnXaKlCir6Nev BKdKWcouLW0cz7f0Kbh42D+351RQi9iKstowi9PwoiTto4sQh0gqWsz4FLvDRSYenI/+kvw/M3bN d+VvCybp7Urh8P2GLrdPZYeCvXxLVKREuw4D/wCAIcXpszKC1cV0OAGpkWU9U6EwR0c0NN8Mj5k4 ACbVb2uQzC63a7Mzr2Jw2C3jumRhNL1TCz1U5Hr2wzbOZbYOvEvfPHhe/ROUFIV0lbaHOoN+p3kn vdV+fJyDg0MzzQl1Nqskc= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 06/16] net/netvsc: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:36 +0800 X-OQ-MSGID: <20220206035846.2840462-6-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/netvsc/hn_nvs.h | 5 +++++ drivers/net/netvsc/hn_rndis.h | 5 +++++ drivers/net/netvsc/hn_var.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/drivers/net/netvsc/hn_nvs.h b/drivers/net/netvsc/hn_nvs.h index 3766d2ee34..f1144897d9 100644 --- a/drivers/net/netvsc/hn_nvs.h +++ b/drivers/net/netvsc/hn_nvs.h @@ -3,6 +3,9 @@ * All rights reserved. */ +#ifndef _NETVSC_HN_NVS_H_ +#define _NETVSC_HN_NVS_H_ + /* * The indirection table message is the largest message * received from host, and that is 112 bytes. @@ -236,3 +239,5 @@ hn_nvs_send_sglist(struct vmbus_channel *chan, return rte_vmbus_chan_send_sglist(chan, sg, sglen, nvs_msg, nvs_msglen, (uint64_t)sndc, need_sig); } + +#endif /* _NETVSC_HN_NVS_H_ */ diff --git a/drivers/net/netvsc/hn_rndis.h b/drivers/net/netvsc/hn_rndis.h index 9a8251fc2f..7c3b750ccc 100644 --- a/drivers/net/netvsc/hn_rndis.h +++ b/drivers/net/netvsc/hn_rndis.h @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause */ +#ifndef _NETVSC_HN_RNDIS_H_ +#define _NETVSC_HN_RNDIS_H_ + #include "rndis.h" struct hn_data; @@ -32,3 +35,5 @@ void hn_rndis_dump(const void *buf); #else #define hn_rndis_dump(buf) #endif + +#endif /* _NETVSC_HN_RNDIS_H_ */ diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index fbb3995507..53939efdd3 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -6,6 +6,9 @@ * All rights reserved. */ +#ifndef _NETVSC_HN_VAR_H_ +#define _NETVSC_HN_VAR_H_ + #include #include @@ -283,3 +286,5 @@ int hn_vf_reta_hash_update(struct rte_eth_dev *dev, int hn_eth_rmv_event_callback(uint16_t port_id, enum rte_eth_event_type event __rte_unused, void *cb_arg, void *out __rte_unused); + +#endif /* _NETVSC_HN_VAR_H_ */ From patchwork Sun Feb 6 03:58:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106910 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B01AA034E; Sun, 6 Feb 2022 04:59:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0AF84115D; Sun, 6 Feb 2022 04:59:07 +0100 (CET) Received: from out203-205-221-231.mail.qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) by mails.dpdk.org (Postfix) with ESMTP id D051F410F7 for ; Sun, 6 Feb 2022 04:59:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119941; bh=y9xSXLBkYp99kTiE4LeqqOraQ/bG3ey24id23RGvmfQ=; h=From:To:Subject:Date:In-Reply-To:References; b=tZjplc5ePX9MDqs+jyNBerImH+W5cZReFUp0loaKdMYf89BX9aEBpbcPJggXh/O9S PO66/f8C2Q9GzDfE9yVsqOSO9Qhb6lZUihnHLdCXUsAYDfnMBmm5RCmJqPlCiLfXaH mmBYBTh1eKp3j43xJqGbG6yWmy6KQclXw4at66jM= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119940tn3eivwq0 Message-ID: X-QQ-XMAILINFO: M6pu7iUFdKTlE9JoTxb1P/yrfVuQa47pC7B12KnPmuDuYsQLrzmcI+BXJw6jOH o8OcMi9GLctCtbtGLlSNym/N1/zEnCojlUT59WypCL8rU6uEvwSKrKoYjs2jHHTLZeSYdMaRfqvn 27cI+aR8sweURs+90QmljSGVldSH118rMSzpcQoSS0dI5FVOYjUwBNLhpyxZN+FvsE9mM8AOWzzF wSEBXe/0CTmZQbdNi6b52g5KEEz98B7HRJfTuJrCZ95qOM09XzQ4jmv40oPT5XTFNhVdREDeLmLc j9FmLCEq+5TYSrvXBsHGtmGouz9OSgAUQe5ZA6SNvjEII1N4jURySZNsIWlNHUJIhUy6l0vIo5w0 XksTIQDYvyY5KT6CiixohxS9JhcHSNdSloiMlRUkt2o/O3U9jEMN8Fw1XLzXg/vDSDBzmCW1OgI2 cfheI8eIB2S9HtpogH4UpIOenGTacoj1+dbZiJIwiwbbHm02jOTlow8fGh9Da4nmXO+969sDv48E z/kgXZOaRmaIWW9VxOJEaa5WDlhUpPBB7K35TlPVSiZAPBgbwvnO5l6fkEM1SrtZilWGnFs1V2lz SbhfZJssJreG5jzPfgzgwmpT1NAL7KlKZNjYBkZFjujkqdz7iSn3JFboGQI2FSB8el3MnszVSGLG yxPivKTFaEPMlvvdFslBx4JXeH97r3o8kZbRBCUjWlSWSiHGWvopVNnibDgVqyJbEolzE4YDjzZV WePAVqDLm8JE/o8YreVgGTTGiuyG45hMlAdJK5wtc+imzqvccoGRMEcsZRndrZemzCBoMNCGDlky BFqzQFSx7uspEG7g5on6sSISd2PRXkuQXjFFsfsgWRbkn189/NMGAxxVDdYD4J9loinWwPAvYz1I 6p/7dmFPpQJAFyHx4UXtU= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 07/16] net/qede: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:37 +0800 X-OQ-MSGID: <20220206035846.2840462-7-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/qede/base/reg_addr.h | 5 +++++ drivers/net/qede/qede_sriov.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/qede/base/reg_addr.h b/drivers/net/qede/base/reg_addr.h index c84d3865f4..d8435f468e 100644 --- a/drivers/net/qede/base/reg_addr.h +++ b/drivers/net/qede/base/reg_addr.h @@ -4,6 +4,9 @@ * www.cavium.com */ +#ifndef _QEDE_REG_ADDR_H_ +#define _QEDE_REG_ADDR_H_ + #define CDU_REG_CID_ADDR_PARAMS_CONTEXT_SIZE_SHIFT \ 0 @@ -2091,3 +2094,5 @@ #define MISC_REG_AEU_GENERAL_MASK_AEU_SYS_KILL_MASK_SHIFT 2 #define MISC_REG_AEU_GENERAL_MASK_AEU_GLB_UNC_ERR_MASK (0x1UL << 3) #define MISC_REG_AEU_GENERAL_MASK_AEU_GLB_UNC_ERR_MASK_SHIFT 3 + +#endif /* _QEDE_REG_ADDR_H_ */ diff --git a/drivers/net/qede/qede_sriov.h b/drivers/net/qede/qede_sriov.h index e58ecc2a51..e95bee9415 100644 --- a/drivers/net/qede/qede_sriov.h +++ b/drivers/net/qede/qede_sriov.h @@ -4,6 +4,9 @@ * www.marvell.com */ +#ifndef _QEDE_SRIOV_H_ +#define _QEDE_SRIOV_H_ + void qed_sriov_configure(struct ecore_dev *edev, int num_vfs_param); enum qed_iov_wq_flag { @@ -20,3 +23,5 @@ enum qed_iov_wq_flag { void qed_inform_vf_link_state(struct ecore_hwfn *hwfn); int qed_schedule_iov(struct ecore_hwfn *p_hwfn, enum qed_iov_wq_flag flag); void qed_iov_pf_task(void *arg); + +#endif /* _QEDE_SRIOV_H_ */ From patchwork Sun Feb 6 03:58:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106911 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8761CA034E; Sun, 6 Feb 2022 04:59:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A83A141163; Sun, 6 Feb 2022 04:59:08 +0100 (CET) Received: from out203-205-221-153.mail.qq.com (out203-205-221-153.mail.qq.com [203.205.221.153]) by mails.dpdk.org (Postfix) with ESMTP id 8B70F410E7 for ; Sun, 6 Feb 2022 04:59:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119941; bh=zj0ejPnA66iQadF87Vk3srre+fLo8OhXu9iBIwZfcnQ=; h=From:To:Subject:Date:In-Reply-To:References; b=GUxGLd1EVIgycMF6RL12uwd2vEHHryOTnZ5dZd38YXKxF95jA9ocVrT7nnq+0ELuA iGeF4L0PyP7otfJyynVhgwNQ3zIPWjnkHj8VBkhH9b6Jp0Lgy0idaJ3X+Xv5hukBm+ g0EyLzMPxKPYSuTHbeSUFhf3SmOwtLfP7e0G8fbs= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119940tm0geag4b Message-ID: X-QQ-XMAILINFO: MFX4IRS9whvrhSjfsCP9HUrT7s7BC3v6YjdUMQ7RdTzJydi4sJFE1E24d1JKVc WMPII0KAoEXy/trhpaiXT+tXQ2ezz3bHK/UF+NreR1wcEa+E0CZ7Vwy8ONDUKIgdLx96Kbda7/ks HxzRy2rBKwq51usl+TvZxIbudtzcBhD+CJAowXxqWBjWomASQ/VJVaT9X7+oKbfADWnHLCFS8VDz OmCgfBQRy1F52lYHxfBIxowaxn5hZLlAMsKBc+JZvCj1KcJ6ZmVn6PMaem+1pX68iDKZbq37YDqW t8rhYq1uKisCZs0Fqod72c5TWLurm3yjRZYZxH6YQDgHL0Ny9Jui0up4r5W5gUjCm7pmHP/PWSyv ZYlLR2tFKcR6HUkYEaA7XZg6olgoebUhfvEFUJwUanqQUzxEOhdXsflY0IwER0tDfsfqxaisf9ML owVX6fXbKTvuHuX0kSRbbuvpI0NojdMRjfR5JYaEMUSItltvqZWpfp3ptbzDdQSZ5uxC1o3jJHEB bPcbF8yrorqh9T16ZblZfJOt+4l6hBhXIWdyoi69eUsd/bHvDfwpuCEsC6ZpPoOnW3OUsRMAyzTK bZD2jfIjOyN9Nmj7V2YNuVcnvp5+jwyfeM2LD5T/SJ4Is5jPcaOMqB65DmWqLZlhfv9aExMDlA6v ZJnngeatcXgtTDSMEkSEKNKOQ2c+e6e+aUNYpKRKeSNdtlp2Gn2j1Dxi0YD0CtfkH8KcS4hxMbso fz5WKN5jyofzxEwRYsO055MVMtaO/kUwXRBIaCHv8xWBYjbsMizW7d8P/ZW0uA2CGp6toQk+TCGI mg+PtSDHL3vq6mwgNe7kEM5XZEGw87rreCJ+piN1MXnCJ/5RKWR+N2NlWhsgBS34k= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 08/16] net/tap: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:38 +0800 X-OQ-MSGID: <20220206035846.2840462-8-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/tap/tap_bpf_insns.h | 5 +++++ drivers/net/tap/tap_log.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/tap/tap_bpf_insns.h b/drivers/net/tap/tap_bpf_insns.h index 1a91bbad13..d4e6bea3d7 100644 --- a/drivers/net/tap/tap_bpf_insns.h +++ b/drivers/net/tap/tap_bpf_insns.h @@ -2,6 +2,9 @@ * Copyright 2017 Mellanox Technologies, Ltd */ +#ifndef _TAP_BPF_INSNS_H_ +#define _TAP_BPF_INSNS_H_ + #include /* bpf_insn array matching cls_q section. See tap_bpf_program.c file */ @@ -1694,3 +1697,5 @@ static struct bpf_insn l3_l4_hash_insns[] = { {0xbf, 0, 7, 0, 0x00000000}, {0x95, 0, 0, 0, 0x00000000}, }; + +#endif /* _TAP_BPF_INSNS_H_ */ diff --git a/drivers/net/tap/tap_log.h b/drivers/net/tap/tap_log.h index fa06843a4c..667d9e6ab0 100644 --- a/drivers/net/tap/tap_log.h +++ b/drivers/net/tap/tap_log.h @@ -3,8 +3,13 @@ * Copyright 2017 Mellanox Technologies, Ltd */ +#ifndef _TAP_LOG_H_ +#define _TAP_LOG_H_ + extern int tap_logtype; #define TAP_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, tap_logtype, "%s(): " fmt "\n", \ __func__, ## args) + +#endif /* _TAP_LOG_H_ */ From patchwork Sun Feb 6 03:58:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106912 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 614D7A034E; Sun, 6 Feb 2022 04:59:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE74E4116D; Sun, 6 Feb 2022 04:59:09 +0100 (CET) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by mails.dpdk.org (Postfix) with ESMTP id CF6EC41143 for ; Sun, 6 Feb 2022 04:59:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119942; bh=VZ8g8l6OU6H7zg4cuko493yzYll7qELHzUf5YVb6daQ=; h=From:To:Subject:Date:In-Reply-To:References; b=A/aleGS6P2VzNyAVU3+9gjtKRgcBneRFJRxnb8MjhabBXrlub9mMweecSHrSG5Lcx OcgwJEaOfGAyBVOLvyh2YbPwK+Wgqoty/0yt0MK1OuhC50lEzdBjlvL3Fyr/rNA97M ltouCTvgeRLHue/VDf4ZSN5SnzsT2nlpkxpdi9tA= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119941txz6wih2k Message-ID: X-QQ-XMAILINFO: MShfLn39PbN2W84uaksQEBRyPyuX6f+iftoiarlIObotPhepM4i+/bOuBNX8SZ AfVpLt3AsO8mKXmlcmgVbv5jfDwrnEkivHxgpYiDPIKYgAByl8dnhazZctQwlscEZqFzS68A1R7T tQqVlX7NKOn+Pd3OF60n9Jk3LdzYLUSLabMKszjT3YuMsalLOj6bqZiDfadOpkOIQt3xaenkL9Ju cT5M8xJ4M1XM2RBBp2AGtKwcw9LSdAOQHzTRe4/cvucx5v47JrkKM6LSe3IyJbhWWt77GvvA33v2 qdGKVhFVtUJl25EREm/kKX5cyyLs0X/G1A7RYipg6VEl7rSWCmmyNDhOeRKiQUBzu7r/eQaHssw6 VsH2L0Gkoyklox+hSRtfLhhN+n6BRDSrd+1YeoVLGFrxNzdqm7EYTEHkmIYE/dDB2wc9E2Tp0NtM pzmQGsgiE1nbvGeoQskmYPHjtg3ZlwYwBp/GNwUniE5jiiNdogiOPwsDWeCD74euQXBQJZ8gxxIz 0yNZ9w8fEoJipq9mUMMdd0wpaNYVsthY1zCPLksSdV/TjrlbiGvOxUadwCCv5t7ngSBDQvvEPwiy X4+9jUDGhVBzxKMCPOxS1z7x58keIe8RmTvCq256y2AozuLNWKEqoSUSEnVdK668XRKTjY7yu62x 9PLhptIJJZhx7QpgB33VXxTByvGwOGW10YKQYaC67JaYbXicgEJm8HOXjucBpuW73kN9477SgPl/ JVYLcFJ+XNxyi0jDLpjsnFiY+GzKBY2zV+ETnR25avG9yEWkzmx8u2ZMIogE6IV5Mu9UL3f9F7sq Krp02h49iuiloARZb9SyKjhheZHaTzrvMrmypGgatSDVCsHxrxULlFi4BGBAZWX6W6sBjTVSm5hj 50lAjhJi9/2dr7OWTY70oS4RQOckSnFx5dRj3d3SBHrd1uz0hTCNQGmu1gG6I4afQ3bGnSpDViEV QRBNdZlRY= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 09/16] net/virtio: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:39 +0800 X-OQ-MSGID: <20220206035846.2840462-9-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/net/virtio/virtio_rxtx_packed_avx.h | 5 +++++ drivers/net/virtio/virtio_rxtx_packed_neon.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h b/drivers/net/virtio/virtio_rxtx_packed_avx.h index 584ac72f95..950abc8b12 100644 --- a/drivers/net/virtio/virtio_rxtx_packed_avx.h +++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h @@ -2,6 +2,9 @@ * Copyright(c) 2010-2020 Intel Corporation */ +#ifndef _VIRTIO_RXTX_PACKED_AVX_H_ +#define _VIRTIO_RXTX_PACKED_AVX_H_ + #include #include #include @@ -237,3 +240,5 @@ virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq, return 0; } + +#endif /* _VIRTIO_RXTX_PACKED_AVX_H_ */ diff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h b/drivers/net/virtio/virtio_rxtx_packed_neon.h index c222ebf00c..a946649bdd 100644 --- a/drivers/net/virtio/virtio_rxtx_packed_neon.h +++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h @@ -2,6 +2,9 @@ * Copyright(c) 2020 Arm Corporation */ +#ifndef _VIRTIO_RXTX_PACKED_NEON_H_ +#define _VIRTIO_RXTX_PACKED_NEON_H_ + #include #include #include @@ -291,3 +294,5 @@ virtqueue_dequeue_batch_packed_vec(struct virtnet_rx *rxvq, return 0; } + +#endif /* _VIRTIO_RXTX_PACKED_NEON_H_ */ From patchwork Sun Feb 6 03:58:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106915 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7911BA034E; Sun, 6 Feb 2022 04:59:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3F304116E; Sun, 6 Feb 2022 04:59:12 +0100 (CET) Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by mails.dpdk.org (Postfix) with ESMTP id E066D410F3 for ; Sun, 6 Feb 2022 04:59:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119943; bh=HTu/tZ+uec/5ekUqe1vvMReZpbj6f1mMTSZnxXAH7Qs=; h=From:To:Subject:Date:In-Reply-To:References; b=qGVTE8hcgSwYEiEYCtCV3Yd6vfK0GLCyuHdNp8QJRrAFoKxq9IETK0MdNxyvvLaqM Hgx3/mvnWdmqbPK9UNTGJxeH9uTEX7bp2ePtEWyZ5F0ABQnPu1IHZhB6Z7+UeM9RQM urt9kmS50w9z7FVJ0QKNBujEh32/z9YKjGePwHDA= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119942tqyan2ai1 Message-ID: X-QQ-XMAILINFO: OBvbJS/7aDyUsFxSfDJH6vrUtNyLfEqAUfF3XrLW24o6FQpjqV+AOCMlMPblcC jgE/Jex3MPcfKjMb6gTFLtaHzU930XbaemtGwtFNwja/GkWLBK7eKP5+TZhg/lwjFv7InV7OS03n +CuI1VM45qq/VKVRftAhv6oN5OfhGrc6hod6nEVNNLqMBkZupL+ug4VE6i9gkIIm1GvWOvAtIkv6 gjHCISYefXp0hkd1sKrhThFh3DPcCT2K1AuJ1CQffbVUg6aD2TXOEU4hQjYtKsNnUFbacrLONEi2 cLWwGOLMlfqxMhwShVHfT/r0pGIiaUSx6l38/0KsabtUs0t/SNsxwicUyGeq2Wo2GGu5wIrwxers 3JQrjYSwaQv+3k8lP/3qzsrSW+YzHpRYcdz7jJFEZGciOrpITVWBV47RQ2W/2TQhNaaewKoUiqkp hxBeL1C6lpCgDTScIat1zuMEE+eKoRFdPAOiK0KNHSizusxlTizKfcSThUfcPvn0HZHD+s+5sPMM wG6ga2HvP/Q5vwQTs5ILcXf8M/KlXIyNPiRkHjlcBUJghWjvrq1N2byvpeSYUW9L6/SJoEfLFATm gBizPzQWuxBGLby5RnTMpyDJCX0kwwL0qgbVTGulRzXxM2X1qVxM2BNOIBoLGPt7yQI+3c+BsAfx xNn1bmZ0647c48Evho6r7T6H13hUhNuFi9owMQtxBi55sMO74ySyC0wmNxMhin7GOw6ZRVVPYHMD QBtWBL3A9su24fp01TY1qs2ia7+6TTIhGBOJDz+bQsbuePEuaN/Z9lV4oeYIGC88DtLKcG3ngini k2motcj2li0b7wxKAo8TiqbiDx7KTeM6gPToYJIwGIcPwOeiAIenGzKXg/72QeiehhX7y/UcOCib O/WShyrIz51JO4oz8huVE= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 10/16] raw/ifpga/base: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:40 +0800 X-OQ-MSGID: <20220206035846.2840462-10-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- drivers/raw/ifpga/base/opae_at24_eeprom.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/raw/ifpga/base/opae_at24_eeprom.h b/drivers/raw/ifpga/base/opae_at24_eeprom.h index caae9a3ec1..6ba6933409 100644 --- a/drivers/raw/ifpga/base/opae_at24_eeprom.h +++ b/drivers/raw/ifpga/base/opae_at24_eeprom.h @@ -3,6 +3,9 @@ * Copyright(c) 2010-2019 Intel Corporation */ +#ifndef _OPAE_AT24_EEPROM_H +#define _OPAE_AT24_EEPROM_H + #define AT24C512_PAGE_SIZE 128 #define AT24C512_IO_LIMIT 128 @@ -12,3 +15,5 @@ int at24_eeprom_read(struct altera_i2c_dev *dev, unsigned int slave_addr, u32 offset, u8 *buf, int count); int at24_eeprom_write(struct altera_i2c_dev *dev, unsigned int slave_addr, u32 offset, u8 *buf, int count); + +#endif /* _OPAE_AT24_EEPROM_H */ From patchwork Sun Feb 6 03:58:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106914 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2060A034E; Sun, 6 Feb 2022 04:59:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C24141184; Sun, 6 Feb 2022 04:59:12 +0100 (CET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by mails.dpdk.org (Postfix) with ESMTP id 0C46A41151 for ; Sun, 6 Feb 2022 04:59:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119943; bh=mqeh2FL94eOWTphP1tzB0H4Y+7HPNSQlusKBsaB16Ho=; h=From:To:Subject:Date:In-Reply-To:References; b=s8OJhj7ePhnTc/Bdgp5zwIVHvFNv/Y0AjAPcxO7AwvMp5aYn++uPMX0dxpv9IX8OW knB7HRcLmvwIOCt8bjaswh1AO+LGaJK8CCDS52W4nNsUhlsaF56G00q/YI2iQEYb1g 1YJNbSGN7qPggjStGgVjoGS0EAv4iTQGJNS8HOTM= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119942te7msvrlr Message-ID: X-QQ-XMAILINFO: MrfJYRspGRl/IdzhPhwtjkCw/8w11XbgNNAr07YtCGLa6mO4F7EasZcadiKjVW DhTjE+y1Q7/Q6B1pWhrEvigl8Wd3p/IfDNppGzIdmCCWG3nlNbucSPjwWq5hI0ILnbjCOXGFCG8G 1T5NOz3OeSAAo6g9muTXL03YbUrk7v1DdeuTWhjgRJilK2j1EwZIVTloS7J2Eh8JCqwpftynLhvL jYAHakNwiKTnZ4+ybslrHO3K1eujkLmutMNHdGj+wCgmTxtir7exBm0OHmwRRH0TVatoNBCYveW9 me1LjVKVMWdNSnpwWUBJKC44nlCiOFdSe/MJuNLzWcIyZiRqxsWUG7LCCcsRYIH0Bnm5BFQOklHW 9+eQHUmxT8tYptqlTtbJxUIc64uKuen6QpBFA+g13lWc1cpn57GrXwoGRNjDrICmAixbAzIf+CWm kzDCPQsg8tNRpk+/4BaR5HkUXpRG6rqrXqWuO/UFkarFBkBJe5AUMi91KME5RGEtCaiC626z0+IP +PLpRN9joS9Zp2HNDkoIMYwdwkWXCepmocBrS6wdgHLyxQ3tklLM3hcaCcI/U/YEvSReNiMb4Yaz W8kdrCVw8WIhZdbvB2L8SyCllKWbQ6Mc2UWdLCb/C2KPrMTv7VqaTGzoyEySpbMi2z7QsAJHPhuP 5kdLI7IlRMGW5cvU9p+Ft/9qmRpJjdJnwfseGPVFo3xtestazn8SQSJv+EpHQead2aFJINnCIPlm DzKJi0ZencC7LssmwNZMmxnqgOYMXi7cA5UHhEujov+v3NAI5056psZ3G3eryTof1UGSjni5RvBU G2lZXSqqzDFS0o0U4QKlnzDnncDwEafKHbl1RgXQ5VdWaGfaQmPMAPnI+HIIuqIQfJTpcSJni47m U+L5etJqPh From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 11/16] kni: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:41 +0800 X-OQ-MSGID: <20220206035846.2840462-11-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- kernel/linux/kni/compat.h | 5 +++++ lib/kni/rte_kni_fifo.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 664785674f..0879a7666e 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -3,6 +3,9 @@ * Minimal wrappers to allow compiling kni on older kernels. */ +#ifndef _KNI_COMPAT_H_ +#define _KNI_COMPAT_H_ + #include #ifndef RHEL_RELEASE_VERSION @@ -141,3 +144,5 @@ #if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE #define HAVE_TSK_IN_GUP #endif + +#endif /* _KNI_COMPAT_H_ */ diff --git a/lib/kni/rte_kni_fifo.h b/lib/kni/rte_kni_fifo.h index d2ec82fe87..73d70c9bda 100644 --- a/lib/kni/rte_kni_fifo.h +++ b/lib/kni/rte_kni_fifo.h @@ -2,7 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ - +#ifndef _RTE_KNI_FIFO_H_ +#define _RTE_KNI_FIFO_H_ /** * @internal when c11 memory model enabled use c11 atomic memory barrier. @@ -115,3 +116,5 @@ kni_fifo_free_count(struct rte_kni_fifo *fifo) uint32_t fifo_read = __KNI_LOAD_ACQUIRE(&fifo->read); return (fifo_read - fifo_write - 1) & (fifo->len - 1); } + +#endif /* _RTE_KNI_FIFO_H_ */ From patchwork Sun Feb 6 03:58:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106913 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D7CEEA034E; Sun, 6 Feb 2022 04:59:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1099B4117E; Sun, 6 Feb 2022 04:59:11 +0100 (CET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by mails.dpdk.org (Postfix) with ESMTP id C32064114F for ; Sun, 6 Feb 2022 04:59:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119944; bh=nT/rHmPyoeOpqLNky5wXg+qreQaADUC/O/7c93r3Kkk=; h=From:To:Subject:Date:In-Reply-To:References; b=nX4cz3qXR2glNYV8COTDY0r6ZlFOMjnAo/2CFjC7BsuRv/Dz58yeXSLD7Ph9q/2fV 0F88/AY8IiHWJSRoxwBfEhRPN9Fupz3JBNlQlIofSQ6rZPK/82w/VCMl28Is35OMom XmE7hV1agFj8NyRioY+z2KPfr4NtvbxnG96nPnPY= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119943t9n2zr9ud Message-ID: X-QQ-XMAILINFO: OZ7HbAk7YCRi34tNTEdTEfGL3FBTsTdfIDDxWiFEi7TH9eXqjT3pBRwz9Nl7yo w3fDuAjSsnAnvfcBN2uCWL1a8MLMyYcBZZiLnvuiXCshTHNr6Og+LMv0a0TnpW1GgfzuFAO9aP0Q 48me+rVJAELW8GEP5uL9Bb4bKlvm//bbXUz+gqYSQ8BHBohNaUuTNOLFbtnzzcKxq8sq35P3q6zU A9PwuDdDhfi/3AxX/frfuf8L+tWyDedpE83BoZB+CBNFNq49jtPfn6oJxOlX6KENBP8Rxnn2y6bJ pZRn3jUBQGnwQJFwuZHyChTWOZz85gBl0suAc5K6T5CzHoSo4QOZPRiyrSvAup8xiyRx3F+SQfri 5qGckjFWkAapCGq5f53ockOTie65imR19S4YaNNjdVe9p1w3X6iLOCqjmTiqqHhXkK5rvzI8I2jY uRroX1CIK3fwwmkyUBKPVsTbHNVYjD0h/0xpN74MsWNMhec1tMPbktu39NuGR3jyo6IuR2p9P9vJ ZgSDmwQLbxj5o+1VbeM+Lp209AzVz0fymy4QPl8Ea+f9Z4BwfmjTGsphNQ6dvvKWzPaagbVTBUMm UD1DMLtkaYpkA1j62JI+t5xLP0pV0JUQI1b49K/wAsy/xXd/WV+hMfzTfKB7WCB+gmn5pynH4jHX iRyiTvUAp1yuMtka9n/4pNACeJKK3DxFHsA+hssaavgh8XAn6KwuNxJyhaQ7Sfn8rUQ07B/URyzl yfnMOdbOLEMW/KUy2BahX789IpP57QdkP+q/++cfB+Ef0W8XYEUYU63VLENJ+BAMLImQ9ihb6PkY giTx8Al4b9lhLOtvAubxGUitwjpel3X26m/eey3OqL67df3TFGW+hIoS5VDpRLN3iycqCBKQHORQ == From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 12/16] acl: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:42 +0800 X-OQ-MSGID: <20220206035846.2840462-12-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. It should noted that there is an exceptional case: lib/acl/acl_run_avx512_common.h is designed to be included several times. Signed-off-by: Weiguo Li --- lib/acl/acl_run_altivec.h | 5 +++++ lib/acl/acl_run_avx2.h | 5 +++++ lib/acl/acl_run_avx512x16.h | 5 +++++ lib/acl/acl_run_avx512x8.h | 5 +++++ lib/acl/acl_run_neon.h | 5 +++++ lib/acl/acl_run_sse.h | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/lib/acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h index 24a41eec17..0c4388c14e 100644 --- a/lib/acl/acl_run_altivec.h +++ b/lib/acl/acl_run_altivec.h @@ -3,6 +3,9 @@ * Copyright (C) IBM Corporation 2016. */ +#ifndef _ACL_RUN_ALTIVEC_H_ +#define _ACL_RUN_ALTIVEC_H_ + #include "acl_run.h" #include "acl_vect.h" @@ -300,3 +303,5 @@ search_altivec_4(const struct rte_acl_ctx *ctx, const uint8_t **data, return 0; } + +#endif /* _ACL_RUN_ALTIVEC_H_ */ diff --git a/lib/acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h index 0b8967f22e..15c8ac2dfb 100644 --- a/lib/acl/acl_run_avx2.h +++ b/lib/acl/acl_run_avx2.h @@ -2,6 +2,9 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#ifndef _ACL_RUN_AVX2_H_ +#define _ACL_RUN_AVX2_H_ + #include "acl_run_sse.h" static const rte_ymm_t ymm_match_mask = { @@ -253,3 +256,5 @@ search_avx2x16(const struct rte_acl_ctx *ctx, const uint8_t **data, return 0; } + +#endif /* _ACL_RUN_AVX2_H_ */ diff --git a/lib/acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h index f87293eeb7..3a6f4900af 100644 --- a/lib/acl/acl_run_avx512x16.h +++ b/lib/acl/acl_run_avx512x16.h @@ -2,6 +2,9 @@ * Copyright(c) 2020 Intel Corporation */ +#ifndef _ACL_RUN_AVX512X16_H_ +#define _ACL_RUN_AVX512X16_H_ + /* * Defines required by "acl_run_avx512_common.h". * Note that all of them has to be undefined by the end @@ -337,3 +340,5 @@ search_avx512x16x2(const struct rte_acl_ctx *ctx, const uint8_t **data, #undef _SC_ #undef _T_mask #undef _T_simd + +#endif /* _ACL_RUN_AVX512X16_H_ */ diff --git a/lib/acl/acl_run_avx512x8.h b/lib/acl/acl_run_avx512x8.h index 5da2bbfdeb..9033e4b324 100644 --- a/lib/acl/acl_run_avx512x8.h +++ b/lib/acl/acl_run_avx512x8.h @@ -2,6 +2,9 @@ * Copyright(c) 2020 Intel Corporation */ +#ifndef _ACL_RUN_AVX512X8_H_ +#define _ACL_RUN_AVX512X8_H_ + /* * Defines required by "acl_run_avx512_common.h". * Note that all of them has to be undefined by the end @@ -251,3 +254,5 @@ search_avx512x8x2(const struct rte_acl_ctx *ctx, const uint8_t **data, #undef _SC_ #undef _T_mask #undef _T_simd + +#endif /* _ACL_RUN_AVX512X8_H_ */ diff --git a/lib/acl/acl_run_neon.h b/lib/acl/acl_run_neon.h index 69d1b6d9e1..cf721e4c3c 100644 --- a/lib/acl/acl_run_neon.h +++ b/lib/acl/acl_run_neon.h @@ -2,6 +2,9 @@ * Copyright(c) 2015 Cavium, Inc */ +#ifndef _ACL_RUN_NEON_H_ +#define _ACL_RUN_NEON_H_ + #include "acl_run.h" #include "acl_vect.h" @@ -259,3 +262,5 @@ search_neon_4(const struct rte_acl_ctx *ctx, const uint8_t **data, return 0; } + +#endif /* _ACL_RUN_NEON_H_ */ diff --git a/lib/acl/acl_run_sse.h b/lib/acl/acl_run_sse.h index 93286a2c38..6d733f6046 100644 --- a/lib/acl/acl_run_sse.h +++ b/lib/acl/acl_run_sse.h @@ -2,6 +2,9 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#ifndef _ACL_RUN_SSE_H_ +#define _ACL_RUN_SSE_H_ + #include "acl_run.h" #include "acl_vect.h" @@ -326,3 +329,5 @@ search_sse_4(const struct rte_acl_ctx *ctx, const uint8_t **data, return 0; } + +#endif /* _ACL_RUN_SSE_H_ */ From patchwork Sun Feb 6 03:58:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106919 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 602FCA034E; Sun, 6 Feb 2022 05:00:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7596B411DF; Sun, 6 Feb 2022 04:59:16 +0100 (CET) Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by mails.dpdk.org (Postfix) with ESMTP id 6BBD741172 for ; Sun, 6 Feb 2022 04:59:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119945; bh=s/4aI8pOSO4Mr19eRB64b/fQszGQBbk16r4UKGXTK5Y=; h=From:To:Subject:Date:In-Reply-To:References; b=lbp1mtnNRxTLX0JtlMZJqYtQ8obk023ryCt/FyVzrM1fbCBwPZKNH4RSHFJHuPy4/ 0Ak6UvoflzfJxBRNc2BEe0C4HGICFJD3+Md5+VrtwoGq5HMXPFWenXHQEnEl0I9jw2 HCh9JPrydsCY/9Li5eHoso4x1WslDXajlOWv0ZtE= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119944thy07hnci Message-ID: X-QQ-XMAILINFO: Mdw6+lqugK2CjNEBsN4yTVz8r6jlOeeIEm0A6Z7qAjwO8ZStTF15StNFEpmdfO baT8z7sbS/ezKjSW71lK1Oq2eanGtUoQlwvKgKRbFHZjKKRVcilvL9+Zycs3oWs/pQ01g7AvBS4d QiHlLcDsT5K6aIxTHTktqojBLbX+KXkE+yYZxxGro0ZFuB89GIuF1G05kdH4tpluHVYf9Ahquqlg ghJLEJGL5AkKQlyRuwzonKzobE121LRIR+pzJ+qnMNL2bZrRvPpQNn/YUACDq4Qg7HrpsvUe8Tj8 L032sy6chaTWBNS/AwD1fof9whLtVzw/fnWndsuHabZXINbZsqe68LMDeRPxyLJSgTPMD9PkyRy5 +7RNprQJb53A4hZdCV/wiwpf+6pHAEhqIxt3yenKMBwz2/4XnohjWjefTwecfNavJDd8k1AkeKYX XQvOaOcb93PKzLspf20A0q5rVI3jwR5PnbSUnocDOyI5ezSqWc0DaJLeYumrW4BKk7DdeDr3fixJ ncG8ynvplka0sLWrytS/o4TNMS6a1ae61BVzFlKC4z89PbmNqM1drbzx5fX2W9GUo4brNV6m+wzp Zk34o341wHzjVxnQIugJ39/Z6nb1R+u9KGcehQ8It9tsTqOCLQdvmnX7ehumkxwNCbAN6FeWuSHV dfO9FVPKvswQ7xzGLwYYIedBsQxx3di9EpKRN2tG4UL2NdCu+c2BbAvzwlwIY6oNxshPUJA9Ry58 az2MuGKkYQXJe/1X8Fs4mMoMISV5uYRfDMvHe1h7nlnzdzAzH4a8W/v3qZqWUGjpsCdZkL1DARAf lSbOYDgdCVxqXkUG8AjiOK75JUcER5R/agxbRPx/vq36RRrkt7x26zVsUjgHRefz4= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 13/16] eal: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:43 +0800 X-OQ-MSGID: <20220206035846.2840462-13-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li Acked-by: Dmitry Kozlyuk --- lib/eal/include/rte_eal_paging.h | 5 +++++ lib/eal/windows/include/rte_virt2phys.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lib/eal/include/rte_eal_paging.h b/lib/eal/include/rte_eal_paging.h index c60317d0f5..0ee5dd467f 100644 --- a/lib/eal/include/rte_eal_paging.h +++ b/lib/eal/include/rte_eal_paging.h @@ -2,6 +2,9 @@ * Copyright(c) 2020 Dmitry Kozlyuk */ +#ifndef _RTE_EAL_PAGING_H_ +#define _RTE_EAL_PAGING_H_ + #include #include @@ -96,3 +99,5 @@ rte_mem_page_size(void); __rte_internal int rte_mem_lock(const void *virt, size_t size); + +#endif /* _RTE_EAL_PAGING_H_ */ diff --git a/lib/eal/windows/include/rte_virt2phys.h b/lib/eal/windows/include/rte_virt2phys.h index 4bb2b4aafe..06992f208d 100644 --- a/lib/eal/windows/include/rte_virt2phys.h +++ b/lib/eal/windows/include/rte_virt2phys.h @@ -2,6 +2,9 @@ * Copyright (c) 2020 Dmitry Kozlyuk */ +#ifndef _RTE_VIRT2PHYS_H_ +#define _RTE_VIRT2PHYS_H_ + /** * @file virt2phys driver interface */ @@ -32,3 +35,5 @@ DEFINE_GUID(GUID_DEVINTERFACE_VIRT2PHYS, */ #define IOCTL_VIRT2PHYS_TRANSLATE CTL_CODE( \ VIRT2PHYS_DEVTYPE, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#endif /* _RTE_VIRT2PHYS_H_ */ From patchwork Sun Feb 6 03:58:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106916 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E465A034E; Sun, 6 Feb 2022 05:00:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D82CC411A7; Sun, 6 Feb 2022 04:59:13 +0100 (CET) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by mails.dpdk.org (Postfix) with ESMTP id 7E8C841143 for ; Sun, 6 Feb 2022 04:59:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119946; bh=sz2tOhQAeihQI/IweQ8mfgVdcXNMttmzxeKO/UzVcR0=; h=From:To:Subject:Date:In-Reply-To:References; b=l6Uktkq26BE4G3/J1yBoBw+qSqeucQqI6zguGsP9Wph5yEgqhejbN70JLYpS+HqWt Xa6uESN/6HobLqtMOh6xXE/pEM4SkEk6K84RqrVv8NGWAzzqHNukChwEoHPxMGNPCz Ze9BEZOZilQYjGf0RplT43WOzcjAk6Pl83SfchX4= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119945to5s651c0 Message-ID: X-QQ-XMAILINFO: Nb6LX7dsrQEkDhKv6KznyUcnRDzhS3fCVEyTE0jmrv0uCZMMVt5F9jcYTMvwMV voSjfezZ50Fi3bobiPVqh9xmOnnBlHdOkd6FjN2PCFRB03NS21tM7qqDzzy7c6ubeqXNfDAr3F3y +ycopcYwi/lZfMnj+EXFfuA2hua8mISnRY3puyVpAYiwjNdVN7tMNT4CcHP4vCZHwIRkIiQnKXRM 1/5O2jqMtGtFeKv2seR/mzcaNfIHC3NQWm6R9Mk3zzaaztZuyJ7sshVUKGG4mAJgqprzxkavX+dq e3cgRxGHUj8QBH6cEF6wKTwvMpxCnEZnBNQKCBbjXhRKT1b+ACcLwIViTI6ioP09K3XE7Y+6M9i7 +TKd/NO16A78trcHHAzFidht4h+/FoYeDLOw+2JtUE6dNh6vXufONHFA7d5LnWOU/b+kjhAGXx09 xvCBF9f5SDOmqJu0+DxroSX2XGByzN0K0pplhdLpX+7TgKImvEMg8Scp4EPnRnuldYhh1pfmr3Gt 61DCGq4TDcKWLCW0YtvjpOqLZfWy0qhIcas1DTvP981opLLaj4jpOS5Q/anLc5d6ajvq8+Ne2YJw djGO7ErPbb9JdkuYQnrOvX9325eTLCYQ3A5Ofz10Ajt0t80T3ygW1n2F5QynP/gRhbfceb9Oc5A5 VLkU7AcrqOy0A1GChNgUsgxFBi2uFSeRH2cMKGI0JyHBfnUBuf23LGTVh89kg5Ah/BEvrgfXSSbi 5rL2pbpDp8wZh3qYKAl7fSHmqcHWmg4cQLeF3LNEcEFscAjQ9vqVaNwXcViteZNvbkykRBzzEnXX DNz9lmaL5MCGQNLpsin/lw3NwpzCjWn/TZw/jfbvUqwXdimL7Azg9YiJlXIaSzSe0cT8MEEjFOdC X/Yt7wreMB From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 14/16] efd: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:44 +0800 X-OQ-MSGID: <20220206035846.2840462-14-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- lib/efd/rte_efd_x86.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/efd/rte_efd_x86.h b/lib/efd/rte_efd_x86.h index e2f9dcca88..fac74fa50b 100644 --- a/lib/efd/rte_efd_x86.h +++ b/lib/efd/rte_efd_x86.h @@ -2,6 +2,9 @@ * Copyright(c) 2016-2017 Intel Corporation */ +#ifndef _RTE_EFD_X86_H_ +#define _RTE_EFD_X86_H_ + /* rte_efd_x86.h * This file holds all x86 specific EFD functions */ @@ -55,3 +58,5 @@ efd_lookup_internal_avx2(const efd_hashfunc_t *group_hash_idx, #endif } + +#endif /* _RTE_EFD_X86_H_ */ From patchwork Sun Feb 6 03:58:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106917 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 250C4A034E; Sun, 6 Feb 2022 05:00:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC2D8411B6; Sun, 6 Feb 2022 04:59:14 +0100 (CET) Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by mails.dpdk.org (Postfix) with ESMTP id ED9154115F for ; Sun, 6 Feb 2022 04:59:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119946; bh=EwjTboBgvSPSMwl0dMQHwY4gfw0LeORIrF27hVGJ07M=; h=From:To:Subject:Date:In-Reply-To:References; b=tBzOLzRizD4083gbPq2U2lYpBw5UxBamiT+jkWVR0KesPMmh9omI1G7lGTrirPaDb 31+LYvKpY6q4ZF7XG5MpCDrZDfKao1rsoB8SUWZbOAWSjN65XqmjXz7aCgB2vQXHHe jqbE36L0uynZ0PpxxYKdeJUx9A55SwSuvWiVIO14= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119945tbci40u6n Message-ID: X-QQ-XMAILINFO: NhDhJCJPIfnT/SaQttjdlmAfVHbGWD7NYc/fD+nOo8alRBbJ3MEwaCfzhQ/Rhq cnOavh59RC/sAEMQgmQqJzq5wyV05O4b6KcabUxkRqSEfQeCdtcxtS9bUskDyxTdPlNL7y6AV/aK pRzOnU7iPNoME5YGZz0NPBhV9WtATGFO+1f9v8RF7aNZhRtVQRGInjcSOURDGJvbkTu1ziwJZ1YS FSGmcqbPTTv2G0T5rR2e1Jinnkphltr+TYXzsptPi/kTDGNmjYMxVLZ6YFa7hnhIHIHWy5MeoTjy ls4HOKlfm7ai2IrQg7VqMxwcBe3hL6G1OVRpiePOSFrRR9z6qQZL2l8o4kAITg/YWt8F7JKZlX9l bjEM+SaWetmjWhOnvR+ayU2ZcEiXru4lj9FWje+s9aBEumhD33SICrkm+xadc8S4Rew4UF1EYC1n g8Mb1MImcSU4gkASa9LzpRsn/qBaJD7hkJJbjx9K26S8oDJXENSzGm/PQ57xwKPzMPLj93hDhj0v 9P/XUK0a6E5YqryezEjOJ9UU7TYi7BoctP7Nr2sFkmy3MVZkmVa3dZUifK1TVtNuYl6N7Rp1xOp+ 2QhbhqP3YLde6uxcIaz73G2EidaELBQv47G+kTvPWV3SUK/1c1ekMlX4ZnfPdJAycrXC/vmn7cEY 17KBq/SP95nrqtTN8cRy0/buu2SJoihglBoMxi3/xF4cgXYZxj/h2eAGCEAnRT2JyCCIF+uFvhGb dzctEWVXwV/9AvpfOqzaKhuMpFN7ECO5PGlcZWLbcigtIp4NEphpuB1LZ2kvca54QFZod/KpHFXQ BUIInbUP56aQZPnPb8KS8C1ObZJ+FIsOLXdPl0HF5tb3loJqNofod3c9EXrkzwIG8= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 15/16] hash: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:45 +0800 X-OQ-MSGID: <20220206035846.2840462-15-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- lib/hash/rte_cmp_arm64.h | 5 +++++ lib/hash/rte_cmp_x86.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lib/hash/rte_cmp_arm64.h b/lib/hash/rte_cmp_arm64.h index e9e26f9abd..aaad614d56 100644 --- a/lib/hash/rte_cmp_arm64.h +++ b/lib/hash/rte_cmp_arm64.h @@ -2,6 +2,9 @@ * Copyright(c) 2015 Cavium, Inc */ +#ifndef _RTE_CMP_ARM64_H_ +#define _RTE_CMP_ARM64_H_ + /* Functions to compare multiple of 16 byte keys (up to 128 bytes) */ static int rte_hash_k16_cmp_eq(const void *key1, const void *key2, @@ -83,3 +86,5 @@ rte_hash_k128_cmp_eq(const void *key1, const void *key2, size_t key_len) rte_hash_k64_cmp_eq((const char *) key1 + 64, (const char *) key2 + 64, key_len); } + +#endif /* _RTE_CMP_ARM64_H_ */ diff --git a/lib/hash/rte_cmp_x86.h b/lib/hash/rte_cmp_x86.h index 13a5836351..f31ec7b1d2 100644 --- a/lib/hash/rte_cmp_x86.h +++ b/lib/hash/rte_cmp_x86.h @@ -2,6 +2,9 @@ * Copyright(c) 2015 Intel Corporation */ +#ifndef _RTE_CMP_X86_H_ +#define _RTE_CMP_X86_H_ + #include /* Functions to compare multiple of 16 byte keys (up to 128 bytes) */ @@ -74,3 +77,5 @@ rte_hash_k128_cmp_eq(const void *key1, const void *key2, size_t key_len) rte_hash_k64_cmp_eq((const char *) key1 + 64, (const char *) key2 + 64, key_len); } + +#endif /* _RTE_CMP_X86_H_ */ From patchwork Sun Feb 6 03:58:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 106918 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72B27A034E; Sun, 6 Feb 2022 05:00:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3904411C9; Sun, 6 Feb 2022 04:59:15 +0100 (CET) Received: from out203-205-221-249.mail.qq.com (out203-205-221-249.mail.qq.com [203.205.221.249]) by mails.dpdk.org (Postfix) with ESMTP id 3172C41172 for ; Sun, 6 Feb 2022 04:59:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644119947; bh=15Mq/55mi8jKrfA+pTEaEDkdo581pb71N1ZY95TqC3c=; h=From:To:Subject:Date:In-Reply-To:References; b=mLiuLbQ9EE7aRYZmpTbkkIBO8HbdIPH+Rb5QVn5ENvyrzSuFKYpnNWz3XKveCyav0 MWeFjUKUMSNN2jkxoTt27cSXmOk1VzRFyqxbmWs9H3AYk3UnoldHyVHYcFtk3Cq47i RvLMVy3fvPRSoEJ5Xw666bjM0UnyzfqINsKexG10= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc10.qq.com (NewEsmtp) with SMTP id EAE16474; Sun, 06 Feb 2022 11:58:46 +0800 X-QQ-mid: xmsmtpt1644119946t6q804nn2 Message-ID: X-QQ-XMAILINFO: NINNlzGNGuWYEI6ocrpZsuRkTwUWV7ZNcT7kw8pseyXtUp3O9y0+adWji7KjuK EhelMjTqOKvRqXcjhhXSEuX0bMIeUn/1NHY4CLo0RPGGoqn5Y8oBO2Ej18zEUqs8L4dBqjlEAwgM gJlRBwd68uAK7r4vbLKTgZ1ZkhDo8CGoiEX2y5t1emsEMQuGlgGHo5WhzkKDF/+3rT6mdL59OrLM a+Tx48jQ5D9yTiKkOqAuxgBFhzJw2cTXdTVu/JbBwt0qju6BV4ax50t4jiGv1QuXKgjMx9AfJxox 5iJigauR2fhn0U8th/a/knEJeIjvTdGFQoiSaJShR+b7wio7v3JOk6JWYHHfGSqO1eHigUiNeJV/ g+yI+U3WtQ+4YdDyyAjJKCtW8wKVV9pl4o2GJCxGM4bUyhIK3dODEOTTnMQKq0WnitFiBSzVblrb KmY5qKHnguErNj8ancvAiKIw3yEhyfE1ZCZdD97a32cv2/QTNUk4j6x6o/8gFV0p+WkTdBLc4Yjq mFP+JJVjumvmV0+zCoyWFSLSId/nX0xyloHYdj2AMWUvEVXpPm21OaXTJo5L/il1VbraYcgEgKZm MQiWyUPzZH7KSoZFIq84k6FM5cS0vQw7I9t5UINMLDEY3nMOB4Wn2QSaj36/2t4IvKvWa6HGFMW4 Il8T7njSfYkCXU9n5QznL0MPtI72ss0YqlnPdziPGKFlZqUvCde3Gve56JUpXyJBG5y859A147/j 55Jw3p3nTJ+et8OS+Ko1MFFi+qBL8LX9xrVso24QMSntHp65UwFMqZCD6Mhlash1KjuE9fP9l7jb CKM5YVEuBRR3sZ3MH3f7o1Xx6tOR+d3/+hSv2ZBS8xJFOqGuJfeKt9sBk11s/I2Pbwa850dFRzbE gMPbHP09klIZyn3YqepL0qS5YyQ21W1hfj6kyJiQTZgftZeLcWffpfBqAk2i+DdHmFVgv03IRL X-QQ-SPAM: true From: Weiguo Li To: dev@dpdk.org Subject: [PATCH 16/16] pcapng: add define guards to avoid multi-inclusion Date: Sun, 6 Feb 2022 11:58:46 +0800 X-OQ-MSGID: <20220206035846.2840462-16-liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206035846.2840462-1-liwg06@foxmail.com> References: <20220206035846.2840462-1-liwg06@foxmail.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Supplement define guards to prevent multiple inclusion. Signed-off-by: Weiguo Li --- lib/pcapng/pcapng_proto.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/pcapng/pcapng_proto.h b/lib/pcapng/pcapng_proto.h index 47161d8a12..2e0c0e8cfd 100644 --- a/lib/pcapng/pcapng_proto.h +++ b/lib/pcapng/pcapng_proto.h @@ -6,6 +6,9 @@ * See: https://github.com/pcapng/pcapng/ for the file format. */ +#ifndef _PCAPNG_PROTO_H_ +#define _PCAPNG_PROTO_H_ + enum pcapng_block_types { PCAPNG_INTERFACE_BLOCK = 1, PCAPNG_PACKET_BLOCK, /* Obsolete */ @@ -127,3 +130,5 @@ enum pcapng_isb_options { PCAPNG_ISB_OSDROP, PCAPNG_ISB_USRDELIV, }; + +#endif /* _PCAPNG_PROTO_H_ */