From patchwork Wed Feb 9 03:02:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107056 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 9FE26A034E; Wed, 9 Feb 2022 04:02:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F6DE41101; Wed, 9 Feb 2022 04:02:49 +0100 (CET) Received: from out203-205-251-60.mail.qq.com (out203-205-251-60.mail.qq.com [203.205.251.60]) by mails.dpdk.org (Postfix) with ESMTP id 979F44067E for ; Wed, 9 Feb 2022 04:02:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375763; bh=ospbQN0lZ01bUbtRi3Bt9Dt8Cz0emUipseWaJjZdsZc=; h=From:To:Subject:Date:In-Reply-To:References; b=MQLUJzvvh7ZfMHXnXxubT/+Pekvh+nx63GAvcBmIONw58TD8+7r3kWDnaY3kPTALs anNOj1Kbfi8LmK7Lif3Ojuwg74yHYQaoBEOBjm7eGxgFcnZcikedQ3c5BjGgUtw4z1 uyh6PUEeDwwTVSalIFtK+VuPz1mM5vVIHbOMxIjI= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375762tssp9q80x Message-ID: X-QQ-XMAILINFO: NYYRzVG8VqwYc+AS9vcHDRUC54gP9S5NBLJQ+crE6I24SrjX8UlQ6ltynt3mTO PK73adCmH+gZQIZFWbkhxdcgJ4BZ/sKklOXxKXRagwEeJczRr0V2LEGr2bdiZ8pWAKlCVsg0oW8S ego+GuLI4mNw1/YgOioYpztWlrfm0oB7pQYi893zXIbHwhtXCYYM9tmzRLeUyxnyyEbcfFBv9DVK qfbCjJpfuEI5Tlbcde+mzKQVFRX/y6kQmvJjL8m1bmI4fS47s5Jw8xeaknF0Y1yz/IBgsD5+NDbT mkRk9DmZbeKAJHcl93ugzhfWyC2Z0IPTHP0ZtAJ55lKrTPppczUDpqxiGc6NQTMK0g7qeci+CiNK YvTPF79gJoW0CdYtopiLpyhWcuP/xnI//wHMt/xKsErBHtW9LllV+WSKlIXip+j0jMxo9qQAazzL chenHwy/uD3mArOwE3hzP9WTnWk3A4dUP9w6rC5X/PCIY76lZoj/66sJddp0kIMJr3yVN64321mT /4G84KVtVTd7YQs0IkWMxCZtsrjXyIRD82wzwjC/XzZAqPGnHvyfKJHQeYO3IKmTjeF8IRgF6n1X 4lAFI2kW5NcHclVl9ziThqFQRT7EbLoI7GcpGKmHYKSYiB3hd2/h55DfTK0yvqOlgBowktMeim59 g2vY3Hg1S2/T5oW/ogXmtqGeJ6zTJIoXgG8wp+BC11zrVBPEgcTsnHeXv+7BH2uqDop87+2TcOqL feii0aPIprYXytsY8RuaUnHRLvFoMghelWcyQ7xK5ufvC3i03EROLlnA58ZEq6hZFo9+/9ICXrgx rsH3NExo/s7sRnlQhyvmN+XT3R+mubXPo0+TVuJojCA+/mDio43JgE From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 01/16] bus/dpaa: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:09 +0800 X-OQ-MSGID: <03f502f9083981e761b5ea43509ce4003ccfbfad.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 --- v2: * update to a simple guard style --- 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..3928446d19 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 Wed Feb 9 03:02:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107058 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 B2929A034E; Wed, 9 Feb 2022 04:03:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0662C41153; Wed, 9 Feb 2022 04:02:51 +0100 (CET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by mails.dpdk.org (Postfix) with ESMTP id A50EA4067E for ; Wed, 9 Feb 2022 04:02:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375764; bh=PWBTsRpt/fetWP1RCoPFNvAaw2cFR8K6YLqr1L4XEWk=; h=From:To:Subject:Date:In-Reply-To:References; b=RdYS4gW6rHVZdilPEWRG5tcLGqNf1zZSgomwd1WfW5myYgRz2cUO5rv0w+zTI8PeM DbUcImygumPvP0R1yHZnNKsUoua++4yXKhgvloOMnJ7oEaA66lZYm3CRrg90yYdNZ9 c9KGN7z3sN674FwSJ34DQcUI2q7bL5728+lDZWvo= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375763tqvrcx83d Message-ID: X-QQ-XMAILINFO: NF3DEG8q2jaEwMlZi4wWrFzdehYe4Go1o+KKu/QZfW98nmtBaEdFzCOIx6Es5D 6C3wct4gsnv6mArJ6Be1+t4T8wBseG05tFPo6/Zbq/8brf8Zd8yuhbnldJPMXF/xusMRwQ/alj+L NcQkV6EUaB/YgWfm5puPSR9aenVY96qOAyu5/pOsHaCPXyEO6AeS4lL6HklrJitMJSEoIFLJsUCI gghZJwfQGpjS79rsXGmGrCXWEf/I4U5qakasF4gxKtO2bVVgsPjdBWJrSlcTClPR6xDvlz+BV/5u iDEuphF2WfzxNWgubV3jxhiSjzEP8VGnqPcnCBJ6Tfp0ZpH7Mz4V3jqlpkMvEQWN337Z4EC+OnXx 16Rg2I6z8idfeyIuC3BqFbQYUQtM0YzO11OShNI68YWYb0O8GUH3xl2tzIE5ieDZizbbYceKbT53 P31fOWX4h7VmpWWxLF6Wvn/D74kVTX46V/GHXcqTXiGZlQ1zsSzroxfRMJTiQIbD8TuMRPI+AcNI EWrCn/jRX6VnqSWIW1PheWuwZmndB21BTITLM81OIk6f4+fwmthmDnQZVxPXazTls+Qi8nhI+U3q yjmp0ks3iw9oJ1Mx03o2OOLdGWE7xawEfcvhXihxtgOI+BX5eGLYGE96ytweqM/fue341aLCNV54 7uhLUjhwQ9fLglzwA63ZqHP/eA/5/ZUiNgFZpDxwxtXvmlOHP0zqdj0yy862mlvFUQJNgPmMaFO2 DVlsOjPF7jwaJEKxWAkgcxb6nWI0rkMmQA+qkN4HmSlY9BbY+DgMtYljW/JTeUS2sRbB5RQNRL7P ZJc8LP2WI5WV2OlHzqrfd/M3zPg5QLE9g8tdZfgY1GU1WJIjgpq89rS73RqJ5I8O5GSoh4hzb47W VN6A1hqwvJl8a8XQrCZ4ZyX9DD7aWeeg== From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 02/16] event/octeontx: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:10 +0800 X-OQ-MSGID: <2d554fda5edd69315d199931b83b8157fbf382d5.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 --- v2: * update to a simple guard style --- 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..ddb66c8f7c 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 Wed Feb 9 03:02:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107057 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 E3826A034E; Wed, 9 Feb 2022 04:02:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BC4241150; Wed, 9 Feb 2022 04:02:50 +0100 (CET) Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by mails.dpdk.org (Postfix) with ESMTP id 5B92C410F3 for ; Wed, 9 Feb 2022 04:02:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375764; bh=YtvvGeB45MiGHsAbMKHXC5OiEYDgb1C3N5xeUB+bRzo=; h=From:To:Subject:Date:In-Reply-To:References; b=tdrIfs/MvWnVV6+73FASZCokPpdmSABWcRwuKu+xPaEdh9q40MzvqQioxENYUeY5g hZ3ixeQjzG44zwq9qTzMCWJua+R584yQWFRC5GAapTiWOUDdccOuzzN9OhqWZFrIq7 Mn5wXeIWJQjjwevJPdKfgxekIFaYbTF9Zp0qNOhw= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375764tniouno0x Message-ID: X-QQ-XMAILINFO: MbkhVtI1PGVk5tb4bKbhtHJgQou53sJN4TFA9S9SHDb3P42r+SOOWlEYHSdcDG cf8WS9D0gIs8FrMi2f+3VENUzNuyuMiSsGFeX97U8SgMxldimZSUBb5SygTc01zxgJYfd2KLJpfv ypS/oNZszbzKxVI1pJLWYoHyEhZXH638mYGnyYyypHrbGcHNPxmk0OaxPOiEiez2eM66cgu9qJsp w/KzfB2in5BMqiZuJlAjUAX0H93wery6UPnbCIuFZXn4owwBWkxROFfxB4f7gNmlscvNfL0aCiN0 NFBrpD1RlT1lygcV34IeOw3VbWodYMpEkatmmwdgojZsF+QRRhzA/fI1ZJnX6RtXpeFJY6+p9szR b/f4LvlQ7ue+N0X4LLLZ8Sk1SFsZx/LZxbcR8ha9V2wOzBOC8nRpUVBCYq6cd9AS4ll6QvV1O4dR eLYQXtn/elxfwR0OfVXe0u05sA2FvcbkjmVps/jzMMW8Vb/DrrTrTGw4jdVUCJDIzBRZ2mTIsdwO eQYD1TdHAnIVDQdC5/tzYkNPRrcmlq+RF1PboF+ePsLFSJngL1Z7nydokWUcLYk+QwPKc31CuuY3 mLk1kg8wYlYEdhq450DM1yqh9tebcPk6bJiibX9Gdc+zbx0n3zpRIqfpHD3EjXvBK7AQVENyjbly MKZ9T0WBy1KQQTHK79B7DTchJTVXaGw1vtjCtyNCzSmB71hj+MpxfNEfL0iiWLDqb7hMq1YzsS1P sSiJ9oq7STLoer4gst+pTBFw6XE7r7UoZN+QKNLt2NO30tnaCJyCTHQrPe5Vecxmvi5UocBB7U3X +YxDwGVk42OvmVkchV18eOO6XGe8uUvOl34X0SdwS89qISevrD9VH1zXtHW+G2cRljsovYtK90J+ ZXx7uE59Ndhpes59/s0nUwj6WtWzioDA== From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 03/16] net/cxgbe: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:11 +0800 X-OQ-MSGID: <22b52af4be65b16f1ea43209f79e3375ad8ac081.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 --- v2: * update to a simple guard style --- 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..c90ac09696 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 Wed Feb 9 03:02:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107060 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 75F5AA034E; Wed, 9 Feb 2022 04:03:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1CF0A41144; Wed, 9 Feb 2022 04:02:53 +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 18017410F3 for ; Wed, 9 Feb 2022 04:02:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375765; bh=8/IrNaBJQElb5EB1QLIq+TaP2mgSiuBVEQqnhhuMjcg=; h=From:To:Subject:Date:In-Reply-To:References; b=yVguBOG2+K8ndeBhcZxWyNAxPIbVnkh0m05UPZEHXBabRVcRueoIXY24I+o+5xFIV XyIbrtax7nsZ7XkCOwPwc6GhjBoILJnpm1WX7E1TFOywAsI3l3hZWg7zEzoBp6gWW4 Hmt5XiFR4PJEcK0ls0ZH8NWjBkkGUaPmO3lfzztE= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375764tm0ks05ek Message-ID: X-QQ-XMAILINFO: MPRquJFDOUjC7ho6kXnIbuL/4e0+Xc2uEtgyEPzp3TnqmAoaMHW9+ehTpLXBqt 4iou0W28MFCb1aWWc+61v/EYFiY7odoOt57Xc08c3/HiYF9///R+qKOYZXrFftOnuJjzl2KNavTR 84anQhBJVrt/23WYfwqpp46py6GukstoIizN8Yq+uXugPc8xs9aGxP3bLFNQHTsTMYKB+Y3cocI9 Kupt/wamN2FuZw/qtbhmx84lhvAgSZvhrXe/FBFoBAPEgyCGAT4neZb8gFOCcaKWlazVUw9DXSZ4 Xw3DBnLwrLYBhWUuGahWdfQUoij3Z2bbVhnSkCWYzyOHkcjBdxSKDpRx12+YqVkQOGk7LvfvrecT bmV25Qb1a8EyuWyc4popf/WZEkBDdqD8dFQvVOvqejwdQ+Emy3bqY4pnF3YAx6DaDur9PaDMSMYY EzvM23eSEau5Mx89DtdCaKpN6oDpqjANv8mObSp8J0XVx21qoVHBb6E+7bHLmTxLYmxvf5swjvGx IKA3uTWUXtCfi54gEFrNo+Og59FjsE6wwdWKCclnuxXq8nQYaGLxnTliOoS92g8QR6aVsYxWBTVD fc/9MVC9IIJ3sXlVNPJgRZJI4zfwcXvm5+HIMVkdGPK+Y8P2cCP/8W9EM+4zFiLE71ulniseRCin 5JiO/5xXax7DZemDxEB1A6cY5f3hi6BeMMoQmox3PQ0QCzSI8CbbYn/virFX8eTBJGQcWU7U+UTY 8NZJIp6CWjZCL3fa9zlkV21i+AtONhX2TxFvCyajDRu0paruNlz84lynjYHKtV9VDyFaaJItKoCN ZQbWMQoclJint3k9fI/zCCL00FeZscAki2nSwBUAhYVsiRWER67XTn From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 04/16] net/enetfec: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:12 +0800 X-OQ-MSGID: <8358d6f457de4073c603e0ea801526f2f3a2bd93.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 --- v2: * update to a simple guard style --- 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..e82e549b0b 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 Wed Feb 9 03:02:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107061 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 77C93A034E; Wed, 9 Feb 2022 04:03:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A5A941174; Wed, 9 Feb 2022 04:02:54 +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 7E6494067E for ; Wed, 9 Feb 2022 04:02:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375766; bh=btIMh2hmzhpKFnu+bbJnV+CatJ05IY9Tt8HTIKdE3h4=; h=From:To:Subject:Date:In-Reply-To:References; b=kxC53u/hYu3FW7pRlxAWvrrAl1Ox/0GMdN5WP93NviMMfj1a/yzTf/46jibHLQf/o HyI04p/EX2lcZ75ezlMd+MvDHmDaZVx9j6HhQLr/9sfs90UiXqQ3QLPO/MNn6gkbD3 Gmc/Xb4HKUl+azLOXhNPRgLKVDinVmzSRZGlIO4I= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375765tsu3yf2h7 Message-ID: X-QQ-XMAILINFO: MxtMpmMtaOny7byMO/CWxVsDhD6dcU53xQ4j3KzFDUapicgRflx0+CU9pHrRxR gDdd4YEeyWfmqYsHverECQJU4Y/us23t+9sj037gMAHfr0wAqcIlz7YZBBGuqtbPrLMp2BCafO+Q LCpMAxWTJk5cgM6fL66ScxJ7Wcz1VF/vMx3bWhbUVy/nXzhQT1KvJkmR7UGtCLRtHyWZJfLOyQYQ t8tuN9vuLEhi6oJPGZ2YcCzIRyNpP9weTLUcsDyFrob08dow0JCKee/N/d1C7Gzq1dmD7CcqRtI8 kEWS18ypZPjfON1yFY4n75GJ1qlwDTctkkq+ziXAGMQ+uFOCPlSgGelU02d9JiPf+JE0c5n3XALA pu0ixmvoAGjTScs91tdmGTlKPPAQAYa25flxOzgkkTck3psLVKH0qbJcqHTa8W/B5m0hp714ImdN eYNWjKHpp1iSd7O18doBcyqPUK0QIwqBAHzpsnBj08g8N150j4YDbHlhVmHTh1fL/j/MtiPu0FWP UruQ0iQYsp1MU1mEg9WpkTidr5zwLoqEdPr6CeyxytpXjPvBngp2e3jioE0J25K7FyQhesMpV5yl yov3OLE76xnICHmCcedfN6peQ9gzE1VadUxXBN14LY6yn9kAYpQ9mOGj+CaLLqKx9Z0OXBQSuUL6 WkvMB9IEa/Y/M8nmix9Zg8A0Sg2+jQ2VNgcjUtzapBYGXs/yGxQ8tPfGYrXAdYNZI0eVWvzEFuoP x63MDzzVNEJwNHY4VszBHBSk3gom1dA11N4VhnHApOXxoZCE3j5PaHnV2jkd1ICu0Kw+IkEpjZkw npYl1nqqkScRRJoIojzbt5A46XNWsppk2nbApOMS1egAWxizkOuxyqEk2QmqvIx09xe/60VpRvXA == From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 05/16] net/i40e: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:13 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 --- v2: * update to a simple guard style --- 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..0f4db4a46e 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 Wed Feb 9 03:02:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107064 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 A3F9EA034E; Wed, 9 Feb 2022 04:03:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A364F4117A; Wed, 9 Feb 2022 04:02:56 +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 A75394114A for ; Wed, 9 Feb 2022 04:02:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375766; bh=ohMkLmmcjFqE5xdKa7RuurwUIvaiAVa62TUkOKWEkcA=; h=From:To:Subject:Date:In-Reply-To:References; b=StgRw6SBT0prenQoSNPSl4ohUzeH7HHzg2K20CclWb/kII1Aq5mjWDCg3Y5uD2EXD qd+NtmXAF/E9IWP82GPiKl9hbB7Pz32oI9D3N5eny5xA30Cpj4NPUwzgHZN3ibpSP5 ZIirhubeq7XDW37HRr+uZr0vtaMldagDdF7XrUmU= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375765ts3xpx27m Message-ID: X-QQ-XMAILINFO: NjAc2I+VLG8A4lhpwGNA//oDHe8CgXRovu61NVreSBsWcnurcsjN4WYovFvVl8 z+X2hDpgf701lF+lHRjs4H4+0OFFiCrS4gf9TXJskkRv1IxuPhii68JdEKKgP1RtjpeDVIQRfUqz 6kGS9Kt89tuNweP4fHdjXKvWfPNac01qBNumRbOr8NZW1Xu23mrtnPW/n7g68H+wjE7lLW+bmIj0 gDI9hiQxDu8HzxGi8J/j9mQc9mQaRAgVGwVfuJb3PoAVgN9NPlYHgYgJA4iM5m5X6lw/hDlsj+dg mAMo53UF4y9k64xpd0Peqq0j2wchTn5iLQNcO1ZOeoEqJqjeQTsTo1GAcoj8tsvCLT/uO4hH3bXR T6zA+GoX2u3xjH53axsRYAwUVK5VWsEtqHQ0ggmFgHLOXd/QJ0va63FhbK35rkw1C/oIInV4TKY+ 00cO2tz9uZW2Ka4XFUNjTnEuDBRtN1PZcvaLNEWkfOtUrikadj+IYiAkcSoiB1rYOjRsqlLe/Hlq Lg11ZtBbu+xoyVMnmF92aYKYj07Mj0J3fbYEEEzEZ2UpUiSZCtve2CVytY6DLP32Lp8EoYs3eB68 DZGirH8PdxUvMvQulAIwT9DfvkzbvGmd0byT8Z3709Zjm6hhlGNsZTkUzu9itYrELHlY8qUj8iOy 2aXI0ni9n4OILiee2IVt53lP7bRAsXjjYj1N4eEOkTy5bgJvsWepVtL/L2Iq2XW6qGsetDQklY0t NZHy/7RYVRl0jgJVvTx/rZdnqKZ3tnOnl0mPPZHIKUbjVAmq5KIbU8BLeoPY8Xb6SToLi1spadEm c6n3WllYe68LF/ZHSbrSa3XpAWyXxi6PmJPb1G8NAcUhj1kniJMD+VGu7EqhaVvG4FiVIuhLXxv0 /x/1eLpams From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 06/16] net/netvsc: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:14 +0800 X-OQ-MSGID: <77384c09491aa614cc1e55a3e7db95c52b60e378.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..125df08a21 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..fc3364f8ce 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..36b5a56d34 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 Wed Feb 9 03:02:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107062 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 9BECBA034E; Wed, 9 Feb 2022 04:03:24 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD5FF41178; Wed, 9 Feb 2022 04:02:54 +0100 (CET) Received: from out203-205-251-60.mail.qq.com (out203-205-251-60.mail.qq.com [203.205.251.60]) by mails.dpdk.org (Postfix) with ESMTP id 15DB6410FD for ; Wed, 9 Feb 2022 04:02:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375767; bh=gCR02QroHS3yZ8OuOBeLlDL2TWhsfX9V5lHiBoDMgi4=; h=From:To:Subject:Date:In-Reply-To:References; b=FhdfsBtIaMU77rpc4ZrhSdKrB7SQZDiLlYc0AFXUR4wL/aCfqYdTICj1z05ZqJUQo 5MGalluJ2R4OKxGjy2RPProN7y61P8N6vQe30NFjTwjdLAc9jx5lo8Ui9zWDqAIB66 TwAlRUiPBVZOMhf76TpW74HNRdF5OVsYDV7p7AoQ= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375766tmnf3wq4r Message-ID: X-QQ-XMAILINFO: Nbwsoqx492bdxakZvMEe0mYhr7GqS7tYpXgl28D2ZGQ0lpEVep1gYahsnDZBhn ENebCWaNegBSpo6WCjFeQ3sRagkDICbQsb5E10pUZpaAteQiAcNGaU4vrpwAL7qf257DX0DHaLj6 J2+kzP+PNyOgGx/gb2v0xUHLrchRkQQjlIXZR3/+nN+DUbd+80WGGUHrk6/M9Dp4ZNI9w5H7x6u6 SHqCiI9CXliYbYvvPkX3JYM/GBpnHNbab4HURtJoAvuiBDETxe82LPjDDH9G5A4GMK2eVacfNxVG ea6Dxvr5FL5xzaZe9QhV/x0wjhfguQ5BxJWmNKDXKfckPcJ5j/4pAJX10u+oasVGLznlnj3uzmbB 9lBci0IcEINXKlZlXLHLSPPCSNenX7BZ2B/MxGgx3/6cgiexrgtOP4spbgoWVePYjTRBL7DAwEu2 5WZV0ZiavIflRhvh1KEuR1Ns+kuWCrh8ruUBP/TFeiShvkh6LoHsLjqa65aFpBaBbPNq+5G/N47m dEXVBPgIctfgsXN/j2hAZU1PTZSr83pGOOSumcN1Xb0ROwkFUa9zEeN90tOktlOYLZHRRodv4StT PjpwBIe3IdtO7Nj4QK+9Gh5lZvCAeZgx70R7f26nL6IyjzvO73FvW1oZ2hBxcH0kqBicfFLrZ1qI 1xuPnfuTw1SXfVigXfibNk/rOoCJyWX+BZm+bi9aUSbHFxofpxnT3xJEAvIB8eJoMeBSaGcfbBmx 9PPBb30v3JGbOgxlro6TX3cVj6MrDSwe8r2ex+Qe549LZ1MMYeKef8weSBK3WuVeKayriMz30/nw +mZ26c+cWMQHVQ/vXdbPA0OMkh7HLRuURNVwjQFGkfgHAZpwexOmdmUn0XE7Bk7SdQ38hAKvHbSg == From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 07/16] net/qede: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:15 +0800 X-OQ-MSGID: <624044d876e631d33f93e1bb454581590482f346.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..adbed81907 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..578d111de4 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 Wed Feb 9 03:02:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107063 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 F2C5DA034E; Wed, 9 Feb 2022 04:03:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C065A41181; Wed, 9 Feb 2022 04:02:55 +0100 (CET) Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by mails.dpdk.org (Postfix) with ESMTP id 9905B41144 for ; Wed, 9 Feb 2022 04:02:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375768; bh=pvObum4JV9dfcDM0jpWOqq5lw1/Doh9HwXvBBqUK9g4=; h=From:To:Subject:Date:In-Reply-To:References; b=jDtAi2FXeZmT/yuZycomzOJKXPm9G9oBofVb1oJlujYL+ROwd7YaoOgZQ1mgJq39G pajVzJtLwbwIlr19ut7iVLmr/quFs2jWbjUqrZ/usboABkRBxCxf9ZtmUQ774m0Cw2 Sl1ksoDgxduLKMtN4+Zbq9hd033DaHMDAr8uZeW0= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375767tuwcoah8s Message-ID: X-QQ-XMAILINFO: OEaI/iTChbug6vdv1hddYjDDHQGfBR0GL4uzaDiDtYOLYFFhzAlBi86jRrqt09 s+UwusyykCXRrOcH1jgtzNtZIV1oCxZgIhwoI0Qj88eQ77NXw6EZj6ZFUxA4HHQ6pj48W+9HPCMY rGpglk5N+lsjhJJdPnbgwk6x68MxdUbm27gTO6daawec7yvAxNf/jKIsbTzED+9MAN/Ll5EUjEwn XR9W41kYJnM254fCup7ZmJJwOH0e3Nry+w0Jwt1iMX4a2xQkzXWpuPhTVdSkJ4N873KbjPBiLcM/ g1/cCKJJ1yWJxVjwjgXUsHEqBC7G9SAswlMcCo9rL0SlFcfZElnargwU4Vas4+r4hvHr7hUonivI PwzNZ8orL1uPAeLKdIp8+jQcHyP5u1bicupukyNeNxYPj1v8gxkDq0+6Ae7Op0fbrRn3ReKkShjU t8Ivttq2yFGE6XEbjj9qxXyx8HQWkHCcQHt9C5xrTBZ9VSX5g343xHjnhf6fAk+1bl+PUYJpuhdu 14nmUOXzssyMmxcxHyD3GbvtMGSFT9Bm8WZEc26VxaySVcHB+DehMKKdL7PhcbQdTnx7DGmyWWqT pyvmabsupF2BdRgaW+BJ4x8UdNZFSLNv7cFuCMvA23EcXUXGY4cHAQ0b512+M8Dv1+G2eAadjpx8 Aq7QB5PNTrN9VgpLZREICP90G/EeZkd8XuGKIueKJa5LlnckYiseDh2qcITX+eq7sCi5GdFFPSUS tK8RgRhib4Ktv0GzE1ytxlcCJft1hAbG7TxAZ39SxOuIOZFl7QaM71B4bd5oV1Bd9q7ZiZdZufwJ sFE6iLilE8B3d+cT0JPEhcl/AKZ3cUsLMp6qyypNamttSFseAf59y+w43WjznfguTYmIEMOQPVy1 jgy/M+ZmMbL5M0R2zO4bgD7YDwe7wbuAep2FdHc86a From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 08/16] net/tap: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:16 +0800 X-OQ-MSGID: <354ef35fa29853736299350ee7d551c83c225ceb.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..c190793b89 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..5e4f0ebabb 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 Wed Feb 9 03:02:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107065 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 6CBDAA034E; Wed, 9 Feb 2022 04:03:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EBF441199; Wed, 9 Feb 2022 04:02:57 +0100 (CET) Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by mails.dpdk.org (Postfix) with ESMTP id EA36D41144 for ; Wed, 9 Feb 2022 04:02:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375769; bh=oBkOHiNVb7hvN8V2gph6GOtRlfAVMXflm6MAaFi+9KA=; h=From:To:Subject:Date:In-Reply-To:References; b=HAP8ouzOJP+3bRN41oj1/P7ZXV4YRzFJarKLiMLHh/PPisrQUZPmW8CXlnpqX0s2y bKPWFp8QrUoE8B4OjwyM/2PUW/3uO5LRSau3tJvhimtGxcnmuU9ZIeI6nI+scy2CCS QQm2UEIDhItFPyKKkr/67eRDXDJA4HLCip3qOoAY= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375767thz7nqeq8 Message-ID: X-QQ-XMAILINFO: ObFHHlrAm440tZTwwKPreet9pZL2tONKrgNowDv2oygZofmt77j6ZEKHxDpZ6g 3RI9SKi+mzQzYRczZZqmZQp2qpDJzqp9iAEe6OlzJ8xAk8nsgMowVEMgI+BiPGem3aeatySz8+Fi mQvvklbFy7hOtJkTMV2h38QHWId3J/7O+TIuzc3lDxAUOO7P6v8iyFPiCKtMWjyud10urpXFRaQx 6iUgwp0VG2Dp7GudGY5G1YzKtMEHszmlH1Jh9vhgjdF+CQvMo21ga5EVF1lYH/5DfBNJEX8TevGV CSuO9gixyZtBClz1FxEnNPcz+EFyd7KVZdQlz7KCl1WARkEzy92u+7ukIzze02yKAOSA0HZtPmlx mJCfhCPokqJepiJOQ/Hun4qjFhJbf/Jk1113Czy99Zy7/bD5m/tyis0kW3ZkH3VOBr/Epz9Nof7r q2edZ+9g+YI1jX+ci6SOjNCf3q5FiAtbqWbYBbVUfqnjirpJWJSZtRTlYrsP/Ws2O45/CwfLvHfc JH0i7fo5Kw2MIABb1GB1hXppIHgDjGu/XdLVqr8q1AJ6sS/bpc8aqwZ/463rtJydMjDTyik89a0q Jc2luyjupeJKvGSTcMltHBfOaD9X8JcPyfEHgwyJI7Ad1SnPhkN2GCFUCXkn2pI4xn9mliDXklHi RYnC1Y/K676A9+8mn4uRbDBBkbi7nzOJ7af6SQQYEAw/uqltYa89SHCPJEhjbKNqyXyHxKzxFUzK InGiS/pnhsxT8v0dwTpdJe0ORoucn6eV6qFziacl5z4jBUSDxA0t6u/944fp+IF8vPucp+qunHjp sdB+tCwQ7KuOPPDm+M+p7VZmTxoXGB2xFJAo2GYR4ymC13ycWM/u7DbhA3iWQrygYFwwQa1OzacY eBPm9AcuykDnHxoJxFAl5fnET723TAtyGohKckvVxjkfqnCWIpKBEF3A+ARqmLGpSQoOV2eYhe50 xeJct0xVE= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 09/16] net/virtio: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:17 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..7ac21763dd 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..116945efe8 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 Wed Feb 9 03:02:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107066 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 2A8F0A034E; Wed, 9 Feb 2022 04:03:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CA67411AB; Wed, 9 Feb 2022 04:02:58 +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 88D174115A for ; Wed, 9 Feb 2022 04:02:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375769; bh=FTmNVacgwVkkdiX3iTLHmQlDqXZKVaBc489Aj0r0YNc=; h=From:To:Subject:Date:In-Reply-To:References; b=TOl+CMfB3hjgcWarRevWElfnf2Dusv01LQm7R83NP7Svz4YAYOI7p25nVyXWYwyFh 26rAW1EgFd0iEZ+ghlWSd/JzutoAJilFxKCwpERFM635/fE0iVkeghN84ORncogWrH r/ZHtWULl1T3qAX0XpdGzdGy2uGv/phmsv8FrpYY= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375768thce2c09z Message-ID: X-QQ-XMAILINFO: MxtMpmMtaOnyNDbGSYPN0G/4PXlln8mDtOwu1tteajYKufCeq+ERxpUVdPo25+ t345WV859oXLfcP/LfA75//oYIzqb1DNWGR54OsQE+UPRN72R09K5Sp3c6l+mfU6lWOpp8DiHTiy 9EU5RJ6YQrGnOb1kmzgxSiIctpfmDGq0Hxk0/4Bi9dBfZC/u4WO4BC0dhmuNUu2GROO1hKCl+qRb wkJLsc9F37aIAk0uNQI+kXTiajOrrQuWtYOJXhGwcMDzawaRCaHkRmNLllxroLJ1MeHJAnKzY/V0 NUaXmhXJaXO2N5Pk0i/KkkT2kkroay/Ps6lB/Lh+ZsJlbrqVtToCTgnPPLQYV9IyrpldNeOILPfc xu4bBPeb3SBaOfBbH+++TaOrCcBFG5ovYtLJrjUdGU3VQG+yP1Z+okJZkjSyZ1fTFyTX9sBwcv/v RIGkaW1OggQ988GGe7Xy0H0a4pF8HsdbAuop98lar2jcGQ60e0jgGj2tjlG0XQ1GcQr8OfLvpZkp GUnYymVXfa2KzeIvWLCK/b9ziGIStrQ79dxyvOeyTRrrOQ3T6XeiA6jir4r82Kshxe8CD9NScHUW 9GMwZeCPC2j9LDxCP1vjG1aE0e75Kw377wf3PsftqAbT65If2rZEvF8dxPPXkxTqVmJ3vrtnOvAt 5UhePfeLQ5s4OwSm00x2k4Lph9V0+UdLDGcKXu6bPGjn38OD9zLAZh00de43oiQxSzwtsG9kfQyW mXwmiDMGiluCzfWfqVtDedWOyMv8R63/hnX1Kbmq4steuNCd+OcJkZoRTveq5vuxc84byN+nDSGY 5kx/La/Ud5KeJpUfw0L19QwnFIT+yVHbhDCoT/x3T/Xjfi6+0XeKUFjo8QfKF5pHMLDG6G5RVRMi rm5aYctq8PnnkFLR8VcUFZ7BTFdAhPng== X-QQ-SPAM: true From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 10/16] raw/ifpga/base: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:18 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..9d40b84304 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 Wed Feb 9 03:02:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107067 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 CE5B2A034E; Wed, 9 Feb 2022 04:03:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FBA7411C3; Wed, 9 Feb 2022 04:02:59 +0100 (CET) Received: from out203-205-221-247.mail.qq.com (out203-205-221-247.mail.qq.com [203.205.221.247]) by mails.dpdk.org (Postfix) with ESMTP id 1B09441144 for ; Wed, 9 Feb 2022 04:02:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375770; bh=6rdjKrz3gI+aPHzmeXVGOY0AhaC/LVAhE/La7QBwY/0=; h=From:To:Subject:Date:In-Reply-To:References; b=AaCIoialgGgZKu1LxUhEEnn190MbDTDeCICqjqNT5RGQkPVpcefGPtZpbSawaOehF nuxRrpuFpCJsx57aahyvfT7z5W52Bn69jTpCldf4XBbThxGKcdxFrNbUseXMArpeF8 mnm116CY3QwZvdZ6w/1sGaymLBKHZCgR5f7sPic0= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375769tzjf4mbfu Message-ID: X-QQ-XMAILINFO: NOIkHYnr7VzdqSWhUDe6uWqxDIGDgwA6CbHzoeNJxaVP5/+eee7xhX1LMFaeAi Y7Kz1wxLADupUlsvtxgaTuHekAX9yl0uokA+NMLlf4Pq9feH4dIDWnEvdmYZlg69BaqPbViDYYmu Ey5rTne4CNvD1laWuzrU89P8DnvsIn873N3sxY0DtXwVCzOGIsEkRQq/X3EYt4TXZ/AQo0D8XYN0 Ehsp72PWqCrAVgYIfJbCFUCORX36jUVlfW0bQEygyfa8qSqJxNHSos+qmqSBA+G6ncfRovkcrwCp /MQSVNQ0byi+q0wjVsG5I6gMDieprGa7niZBhRJS/9Fgf2zYRQDbLwemXNcRficfcb3c11MXnT7r iGQfn6C9idx1bFlW5KP7u3j+cPknMZMy8PIHCCoBwk4gvIB0K7Slc8xnEuVkcRJtXB41+k2fv0HK k686DqRIRDV/jnihqluQh+ZFUbRDIbJGXthHSgbAIkYeYzJfU3dQFCwYYjUZqKomgDhHDgS6KIXH 0HFrCy9Q52p2VHNnwGHU0XmagfHSeGfyrbDDiuERhG0spR5PoBDk3VKqSF/GoE3rjgDcfaCZAJF/ 3gJptUBfxfwBjqdnOC7phc9fsFWGcirYOq0VcBT3AYNyg7QD2Dc7RDVlMd7cobut+b7JiL7q88AN XLlrU1mRMAE+u+CMtDfJhzTsmRMNl6Y78IM46MVIrWFIc532F5Pz8/Cjx0s3iHGPU70Yu4m5IOM6 LmuyJY/XSjKsK4VPXlLmcMVmYmZA8ttcOFDVyR3bKFMcOngvW6yAyvRRFR/H8tGfi1tzeFw2k5Vl LkSI9u3Wx+1qVBKt+4r90+j+0oHMqkjNY/enNKH5x4eHCt7OFB46aZZbEfocAq6AkRpCFlK4gmlo R+XGuexfI6CWNcpucuFFiiyJ8rtBb3YKfdZSOlWxgzkb2bh1s67KClCKpEudJFnqaxohdl/lFCet gK0DpVm2I= X-QQ-SPAM: true From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 11/16] kni: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:19 +0800 X-OQ-MSGID: <9f64bdde3f088b3130729c1c9c35aa139b0a5b9f.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..f15c66df26 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..2ff71554c0 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 Wed Feb 9 03:02:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107068 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 CCAE0A034E; Wed, 9 Feb 2022 04:03:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FF6A411DD; Wed, 9 Feb 2022 04:03:00 +0100 (CET) Received: from out162-62-58-69.mail.qq.com (out162-62-58-69.mail.qq.com [162.62.58.69]) by mails.dpdk.org (Postfix) with ESMTP id A4F1A4115A for ; Wed, 9 Feb 2022 04:02:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644375771; bh=1aoajwQudJsKpjGDGbkR3gNpMdBWWXVfmXkfJu/AKrE=; h=From:To:Subject:Date:In-Reply-To:References; b=nte/BtgPNcBrs9IEayDQSfzfknYt5UZI/i1dpwH/5u5ti7Yqz6/LWhmD6xVyg3eul 4gr1C3CqVzEDeM8lsC1tAB086anU0URi3l4PounT7YArg2Ylc1a/yAWkqXVixzfTr5 1ka1XtvhJgAVXLUyFGhd4BjjN7PzEzVvTm6GNoKw= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 98A6079; Wed, 09 Feb 2022 11:02:24 +0800 X-QQ-mid: xmsmtpt1644375770tuga5yhpj Message-ID: X-QQ-XMAILINFO: OJmOzhnkAA6FaXTJRcz0sCsXdRt7W6wSJ3L9yIqi8GhH1sNWYMxXI46j3kG+4Z fZtJo8q3OBGcr/adcJGXy8PNsrX1C8M8Yg9srNOCi7yq/mI2ra1YXpMecTlCahktOfC1I2JevA8o bRVS904orVlFrqJMmT01NurCrIB+/PhmOc7usotBD3qOjydmV0lnAzHwt5OW6r8vy/oaISUBR7zD mk3cMlU7qQeHJdz0DXd0KS6kpdGRF6X3mGZyoRvImmfjdQ6EBGVZHL9EX+rQsWUBwjQ6gfOIoYjo 8MAX+OrvXIagKjm5cHSnilq7G/gu01WY2sw9ge+a9dyLAKoHEDXBfRV1fwSZP1787cHNJtQV02fX oxweXsNSvUDoAqN/JRbjrm/HTtHzD4LSehg3e/PQpelZ7wnBKANjTqcelpZHZF9WfFbQM2O0GNAA cJEtspdvTZYzFcjDuzMxoH8Xq+ccoszJYIL53UvF+/d6rqsBk0IsrKrWqeAz/2kUQ2bkLfTO0Kas Hnhm2gvh/L9h7axO9vjT9xCiUy3jB2SS7oDh8TTvBpt2cqafdVWE2Jm8xOI9V80sudQykwfKsCxF UPJL5iHkPNfy7Vy1U49rl/dZ6xVlaKuD0ReJikSm+Mdc7e3+xkAI8kP1daIns8yJNSbcUAg1FFkg x/OQCSgWuRWlyR4p93NkU2u04I7JhmhFth3dW00YdK783DQh9PYW75+UKlYkM7rCfA0eqt7tbDD6 bf22inA377uLdmZOqW2XoYF/yFAJaGfStS5+UDmEz0bzm3mr9duG5xT3oIMPpDg0WpcorvdH56SV nEzDLm0irMsnu3dKjijevHGUOTFt4tw43bW1uOwfDZizWw3hByxJGXBx2VKcBm3lJoyWSeaNelXC ZkAbZn5IsJmu0wRon//IjB32gdufZFvi9Vg+Nc9tUGo5hRwAe2hHO20RYvDUsa/zx/SOm4vJU8 X-QQ-SPAM: true From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 12/16] acl: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:02:20 +0800 X-OQ-MSGID: <9840478bf2a3a3d556873b44fc37c2f50882af0c.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..01330566d2 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..3713c46bb7 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..39ad7d0686 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..3b86a7ac2b 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..1393ff3681 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..f10c9a82e2 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 Wed Feb 9 03:16:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107071 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 04542A034E; Wed, 9 Feb 2022 04:16:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8399B41153; Wed, 9 Feb 2022 04:16:33 +0100 (CET) Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by mails.dpdk.org (Postfix) with ESMTP id 5B554410FD for ; Wed, 9 Feb 2022 04:16:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644376585; bh=GbbyVIo6nhjyVx6YsvxUQXwE8gcu97iAY8W+vvvOIxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q88Gsd6kfpuY3LX9LdoOypSOYX6c+wSawNaylefV0kwUaRnX4HauRRtejhTP5/32m 80IuBcbSSeUr6CHc0tJy86AI7p+O86D+iJrrMZrgm1fEQg/rMWFSLgDyeAoV8fixd9 nstc+HEanW9T+yH1KQXamtpao4UfLufKbZ/RLp98= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 40D9F6E2; Wed, 09 Feb 2022 11:16:13 +0800 X-QQ-mid: xmsmtpt1644376573tl7qrd2so Message-ID: X-QQ-XMAILINFO: M7r/zttrUmlkwSivpoBnSvAhyjR5tKBQvvhTOAmT0fvghecVOIW85OIMHVDRsv KXbX1Y3dUeKSMJtxRMTn2xrXtFZBfbGnd3Bd/UITQKtEECcWfWjgytNjjQw8Gp3ZkLZpt+u6a419 VvYQ5TU74J5i5DG4+Q6t4lbjpo9yk2euTsCJWqjpN6GX4rXmJlcV4sbv6Zm5CXwK7EU0HPM8RYpX nu4+DwhfyhuinpVNRl+iY0vZ1tS8fqxkHrpB+bMYDyIIk4MoMMi3h20bBV3TZDnbLStrs0mTnjh1 lWS/u7dBkFbGjvCGzZ7iVqkpOQA77UxzRtQwgEoxArC1LyP9gIKB4QyyCMQT6H7AeJQlNCUtdx1T Z3DDmkD19dgz+uBPusyLJtNHO4cOx9riBFnS2J1HOdzGXAwJ8c/jxRSTDZsV8ILzK3JRxUs3ZIhO oXZEOM49sqTmUTYGvgiqAUincLuJJT1BOkTwvxhUK/dbI60ExrkOgK5xhiD+maG1owU9RzbsykYm JJDj4abgdNCdqMuq1Pl0n5vU1b5ftR+iJoRY5BpY9tEYFvvtoQzJx1xmS7/P/TqUqZPYK7flZ0Di oP8GubvpTlgFecKRtWZaNevZ+LLhSurwfZv+khnI6tU3/KPQQTTNkjZCDkZgeFyJ3vybOsXA6BAo NZrQsx6HTPMv0DUfmTivoEm3vWUZs/YvZ8cXTsEDA3gOikth8BHcjzM6Kube69I6C3mDyvqmAOZI 4gXoZMit5Zg2Rk19ZdywlxPo6axWZeOeDkyhvnp59zM2T5ZLZM8z/1SFerhCCSsirN3tg10ingNe VqBKi0H5tX/scvGeC4WuYBLiJKRm6m1lf8Vh4F4/hkkSP2h63PM+Ycmv2rMMvblu8Azqiz7MOM0Z j5vPRsv0M2wGpbEITINXrC2R4HSuYpmU2OO3u4HhR8 From: Weiguo Li To: dev@dpdk.org Cc: Dmitry Kozlyuk Subject: [PATCH v2 13/16] eal: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:16:10 +0800 X-OQ-MSGID: <2580fdd554b90f0cc4a1dfcb571270c0469e1f82.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..75c4291484 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..d0eae33141 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 Wed Feb 9 03:16:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107069 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 4DC02A034E; Wed, 9 Feb 2022 04:16:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC5E2410FD; Wed, 9 Feb 2022 04:16:31 +0100 (CET) Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by mails.dpdk.org (Postfix) with ESMTP id 788B24067E for ; Wed, 9 Feb 2022 04:16:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644376586; bh=9nXmUr66eyTrqsTPWQEK8ukW5n9Z7QjGgLUJ/OKqrec=; h=From:To:Subject:Date:In-Reply-To:References; b=W3Wz9FW0fRFEWKQWOgVpG83F2wSs/NuBm/VB/qhx3n4ZFkUyowy7E8rftw9OsiRJr MwmhdLROF+UnkhfX765F3fAsWiOXzMmtWfpLTyNDu6YC/D8QLBIvw0o3tvH7bL0bor i9hg9qczSD4RnQCz4UD0X5W1/eTQjOLI/6VJrI3s= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 40D9F6E2; Wed, 09 Feb 2022 11:16:13 +0800 X-QQ-mid: xmsmtpt1644376585twiparw6d Message-ID: X-QQ-XMAILINFO: NNYn39Yc17X1Kn1/LMhlq4Ga7oR9KwtjS3OC4xAoSRh5AqZtXnJm94vjIuPnym ed3x+/KKUC+nh8HhrIt4Kv8tLjeo2oMslUoxfxNFrjZ71AlRxjzA7XLUUpZYOD9ov8QzRfAYY6hw Yz6BCC0AJZcg86pV/R7Vg7/boMYlGjqhKzmpyO0BOTkYLi3qdrpxCzVs/kTZ7u3AtU5cNCD2DVJk Fp8JSXeC2K8V6+b4MNv5S9JYgJ2kY4G8Ok1npiJlFZ4XD5aBL5XX9GarTKAinLRLOma/6rwvfUXk Ou92qLxImdQtBY8QDe7AN+UZqWp7Z97I7jLQrCKQ9Nl/jYXMlraHAQwqkJ1nG3GXjWG5eT5MI0VD Te+lAXs7Npo92PzwX+R1p5BLkvFjTQgcrLqcinzdy47tRsAzr6jEAw10kvIHGVMap9mEtS7Y2RdA 9OAIzfzdTgjuK5l7Jgw0kckDQKArcXsqBMzlV3a/Y8DRi8a82gQ4q3/udfCdeE4sPfyQV0Qv77Db XDiSjBBwWJeh0z9eMFZb3GTqtYdG6NaCgDzKB8ZeN7epzhFZl82wrwBz5cMXc7bxVJZb6Wds16YK Trjoy+lYCFrPpau/RCXIPQoEvwt8WMCicxUcDMO+/6nxqaDEJ91YYMJFjz83gaDhV5Y/0UuQSgqb esWxnvTX0OfEvugICVU4fams7N2OnEJi+0QifuQpz8QevOHKYDHe3++ThCQjtMt81lsr1274r9rx YVEhFCVWEumhCiWlD/IHrOsW8H1yIRtT9ufl4Om3CsPpP/6FarXdx94qhbm1b+LkXqeSzj2cCyLy Yn/cT/uELf4xQr0DDvUSFJs1x3s8KEWP0LDWwPbxR8ge4gWEtopfLI From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 14/16] efd: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:16:11 +0800 X-OQ-MSGID: <8ecdae1e023921632a096f25383eca0e022fa1c2.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..6e377765f9 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 Wed Feb 9 03:16:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107070 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 8167AA034E; Wed, 9 Feb 2022 04:16:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C80A4114A; Wed, 9 Feb 2022 04:16:32 +0100 (CET) Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by mails.dpdk.org (Postfix) with ESMTP id 48754410F3 for ; Wed, 9 Feb 2022 04:16:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644376587; bh=8qkcX+Ot98F+a7QbNqL6x7qBM8kPa6VYTK9xkdFK+dA=; h=From:To:Subject:Date:In-Reply-To:References; b=vXg2haQmOh3lCYbsn+WjjXDvTZ2tZOerfIkTQfKOfZnLAQA6cbq9l6sMNT0JKPp5D FHoJp63iYId1g3xf3b9HSXhR4eKtIszeDeOqkAV4m4Lw4I9bEinSFRCVuHWIfeqSWl EdX3tU2eHkogTRI7e+9vgoqNCvRpM2UkFi/WsQmc= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 40D9F6E2; Wed, 09 Feb 2022 11:16:13 +0800 X-QQ-mid: xmsmtpt1644376586tsusqqimy Message-ID: X-QQ-XMAILINFO: MPRquJFDOUjC7ho6kXnIbuJtuGWixtCEQChwrlNDaFxtBxaqCc5e8+b6/oDDtb AfNfOgqmY7gXf0Yoesp23D/O71aEHYgO6aFYts6gJnuL1JIzzhEhKV/6L6SGZ4FL5v7AFcFxyoxu ufQmfgI40XBkiRSVKRoZpKManZPmckRROLVI6c6rgbxbTeJMBLvKNpxOGk72gIYfxti2c4sDAf+1 fFsGBWxmGpC0Lvd7V7HiJui8Zvj9K24pfZThZ4vQbxCZOC2nDSO8k+t6a6p/UkhqzWahMRE7WNV3 1rrcO8Gab6l7vWGhRlXg01uy2wcGHTTBlo6awbmOsyBEg0krCLZRI+7Zr3u+b164nHP9F3E251vH gXmmexj3CbznBnP2Ed405VW9Sp5a+9KTHkeLnrer6OHZQuHYbsJjDkCx0YLucMP6ZL6KaMWe0nNJ jQJFRP4xss+mMXWBhHF01kFheHkj4lXkb5/U9MnOgAmMZjyPi3o9r367+dGXw9VqCm/Iuhniy2Hc lLGeH2OgpkIjtQdxSmf778rSs2uSl5vCANcD007Upxp9JI9E24v8OhT1aln40vRTYpHpivTouUGh 4Tl+4YVEK7w5/QJy3xegbAL1eIHriT5zy8xgbCkzwP5B+vjoOdOR3wbcA2Ow8z3LX4Blvk1BvuUz VxJ4gwOwToTIbXPWm7c5BuzeyM9qZGN5o/u9EmyuBcX6SHcRZ7wE3Km6cS45aeq3cyMJ1HZNZmxu 6R4xD4+3u1b7a7SnrhDziDShkFgIF5Oy6H68U5548aaYB9qg+ElMRNf6CcDUl3lOfldsn2e+qi+w qfCMYBBDxKmOy2vlDv1MQ1/3LObDCFcWnsevlRaDlxGSx6p1J+6SVD8VJcqRS8YWpsys5Ll+rnIj rKK3l0Q9maH95Vxz5gN4Q= From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 15/16] hash: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:16:12 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..ecf0ea3e6f 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..3b3b3860b1 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 Wed Feb 9 03:16:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiguo Li X-Patchwork-Id: 107072 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 BAEA7A034E; Wed, 9 Feb 2022 04:16:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 666EA4115D; Wed, 9 Feb 2022 04:16:34 +0100 (CET) Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by mails.dpdk.org (Postfix) with ESMTP id D333B4067E for ; Wed, 9 Feb 2022 04:16:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1644376588; bh=Bf9rP/NEQ+5aXbO/3wSKeOzCllVmxdWDKLpDgCIrD+I=; h=From:To:Subject:Date:In-Reply-To:References; b=lOanaZY5coRsmatvGzZ1MCIXe41dH2BF8PKthJLEmwZOf1VD1OUWHn7yVSO+E39Cd TNaO4rMzpNRSYfnQkrpvdmfMs9IYZW3LC+MTcBUySrDoVu+jRlQIZx7FijVd/z7J0j ndJSiVVE8xFC2SSUeGL6kwm1SGY/wJQ826MkSwgI= Received: from liwg-ubuntu.lan ([111.193.130.237]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 40D9F6E2; Wed, 09 Feb 2022 11:16:13 +0800 X-QQ-mid: xmsmtpt1644376587t9xspkhq1 Message-ID: X-QQ-XMAILINFO: Nvas3ZbWNmzs0UU/sPRIyQHClodeJXob/sNz+u+S99XW+jMUNeoV9cmB1e4G2t 6iGeGgBFn+En7FwPPzMcyewoXEMrIk5w7m0yVfwjwF+JMneA+GI95xswUV9bB7cXp+OIUSBOIzWv OnhYN2bRLoCShUHJE+kfLV7BXAmNyHzfXcaZUrtOkB8+4fdYmWKe+GzogwmKEfkKWxYZ6oiEHmog /VFm3U3YJ9WYKT0dTiurfr3TlZwcUMFl7BID33+UZBEPtfROMC42CGlJm47zZGOOcokLwvvP9Gtp z+FgueuYuGdRIm9u7xgVmEPClfxoVWNW9PYkwIaCDyH1rY8bx8XbYIDk2gG/U8OHPFtbLa7Dcbxl oiUbp5hFVwPz1WHnXlUnwPr3ZZOa2KwqQ6v3XQ928v0kK4xzibOj9neVws3sOoY2DQU4Nc59wtte 4yO3ZmYciLUrRDv5ZaWt1aP5w7zySdGo4AqjL+UM8hHOWaEnDjxuWIeyQJDTMTF2os3PM0slosgm ZhR7MoibGleVmkGdEPS1EZgn17lJmDZo4W91YIZPOwbh4DRAyMQRwHv4lSSqMkSSD6NEztmatQIl CxQ3HKDJezhuOtu1HJUmqU+0JMai4vr1FCW6L7DwTftc+KiozVGLVOVuuX8gAuclNHQMQpgEcgMY QcseJpQoPJIQ/+f6LvP1koggGpuPbKFE9GQuhaqx/t/gAN1LeJ7M2XQHthXZRs5zxixOX75XZDFo pxo8n6+b2ZqXTPXy2gzUlfUsyq55y/8iuJ4zmK7Kwdo39tauV9gsg399Dmhxkm2SbI9ke/IEfadf j7WyAZVCXBrnjy4T9qK2VdheyLrZkaGW6nMWblTBZ1Z8B4k9F78ZtFX2ushpAfpuKACBkD77/rui ZL9uce+pcL From: Weiguo Li To: dev@dpdk.org Subject: [PATCH v2 16/16] pcapng: add define guards to avoid multi-inclusion Date: Wed, 9 Feb 2022 11:16:13 +0800 X-OQ-MSGID: <0786b9880672f33f84666269d50b0f06d552b816.1644374873.git.liwg06@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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..6dc100632a 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 */