From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0047.outbound.protection.outlook.com [104.47.34.47]) by dpdk.org (Postfix) with ESMTP id 5F5EA69D8 for ; Sun, 12 Mar 2017 15:03:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=H3+qiZPjUS7vm9C/zIQxontrAeaVkMBy81ei9mN4Vtk=; b=b3FxIcPDoC4ryC3vPrFS1IavvdJQ0XGC3/7og3FH27u32+Xp7Z7sXUtSQUJEt8w/Ujbd86Wm1/3jMR7fbvdzA/nodkUU/XWVSz9vNHcKvC9+nx3WxDZWj7nT84FTltq4z+xClfISycKlIL9hxnKS3Go2C1g6ZstdvhaLMxNHR4U= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.localdomain.localdomain (111.93.218.67) by BLUPR0701MB1713.namprd07.prod.outlook.com (10.163.85.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Sun, 12 Mar 2017 14:03:06 +0000 From: Jerin Jacob To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Jerin Jacob Date: Sun, 12 Mar 2017 19:32:31 +0530 Message-Id: <1489327352-31938-2-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1489327352-31938-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1489160345-21955-1-git-send-email-jerin.jacob@caviumnetworks.com> <1489327352-31938-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: MAXPR01CA0042.INDPRD01.PROD.OUTLOOK.COM (10.164.146.142) To BLUPR0701MB1713.namprd07.prod.outlook.com (10.163.85.14) X-MS-Office365-Filtering-Correlation-Id: da7d2e09-d2f1-4cb5-afdb-08d46950834a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BLUPR0701MB1713; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1713; 3:S8pWnHeRmwpOg2WlICv+vOztXCyRxGwM8csDn0P+l9tMb5BP+/LEn4eIzCMdBdTLocIGfgmNaZCQd820K1bAOSe/HsRJ6q8lTu9zL9Mon/2ylWEEcIJRZRqrU3BIelDhPzbFt6L7veU9dHszBH4cR8T/6ZP3D9lrg2fjtTJ+OUN5GwKU8CTffbQRnyZRsApzrpwhVd1nie9b056Ql2mnlCx+UX7MkwOE5FCivauYsF/o4CxBu7OChwRD5bFrjMbZMbGNkEqq+bYSGnw8tO/C6g==; 25:sq+34FeuNTUYnKL2uF4FShnQNxdsLvMejzG6na2IYxhBbc1nhutw2dvf2ROlz5G88x9jQDv2jlZTD/ElWmNX8/RHBYTKfLyoZtHt/+bSlqv9vvmb0z2i0yFO8auFOpge0jx1wJULpX2JEoQHA5mJq+HrRWqlP7/QObY3jlBzHlH7VIYLAthD2UyuymAjM5TOfigfNfhsDPXXeUeu/gc+dteRzFovt3ZA2XOnrMUXiPD/zUBPo2kOyWsWcxJZ8eeV9dZziZUnVBawB0XhLLPlrEnqxuAyDf7Qik1oGiDnAN9zdLNfUAp3a3upumS6Opt5kjivCv5Sku4o5RrblOf+j5a28l5Vr1puTYDP5opiEsgVH3ksboatFR3kG2a3NCEbI1qMsB4vAvrhGRxdsXisB53ZOY99+hLrd2/1qKciVltDXmRBzWxx17KA3wjdmzI1iYoiUNC8Vk5joOPHVrqZPg== X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1713; 31:PZz5ZNy+HRUA6Q0aSJPba/zJvsCi59tI7/xFxtsM4HUpKUsZyUIJGcP86hMlvSNcsvHz6d3Mqn/64FH41EbIgp09jgcrGn6Xt8xYd40L/MUoR7EFZCwet2Z4C4PO5ytkcMPQwpeI5Y8eAkDM8S/XIJ4FWnlBq3nDDafMkXbyeHg0FPRa0fIv50QiGRvZsqAN5iYTYqxoNou3m2NuwQNgtQQs6W6GYV03e4agxx60eXBq55H3pbP/s2yAX6CSi+pJ; 20:Ubk77z/lUebhkyJAQy2rivwAbIuYztu7t92loqIq3yAL2QmTykChFNBQoeAd9EC35f6hVXjg77VsbZAYpwGLcjmvYh76W/+tZisYaEFeH24EugYSds5AD6eYkJJa8eRaNPPcSQH0elXw9EUAHTvDPwh7h16rwSVh8S/b5HTjkTE05pjQyd4G7Yd9nWqzd4YnGf/7yMRaVZAzKJ45QFKrQMoVJJy95n2NIziFt/0QzAoeCsrg0wwwaAYLZgoQmkrB+sVhvU8GUgShQf1fr2SfyPZUJizHsYnZFMnt3RFwJZw566skOgImOqRV6dpYg/2Ath6cHEAhbQKcBedEOpE0lWboAFzx/sVkGz+3+5LALJxsKtMr/ke+WdMJ7oNzA5aLfRqFm3QREwZOBSmWTjru7JqhpU4DKGKHKXBMl93PpPAg5z8c6/ET1ZwWLQq/dyUT4i7htHV5vi/bDU42X/7os1P+BB5mPhmdpJP5PF8GAy5gSn+A4r/YainM7FldFGpgSoPDB/w9M4n1n7zZMdbwxsb058/qvJIIULYX24lGzx1Wsmifnx+3T0YyL6LDcC5RBxZpX8yw+NMRdL/qoRpBqFgT6jygnIolBksRMt1M61U= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123555025)(20161123558025)(20161123560025)(20161123564025)(20161123562025)(6072148); SRVR:BLUPR0701MB1713; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1713; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1713; 4:B1xcxpp4H3KLs+zM/ZeqHHGSWYJ7htWYK6NeVi9dJI2VeyXz4SnuxxyuhGwL0nRI8Xd8N0KaJBllR4CRe3jbMRXyN8QlvyY6ue26usNPapRJQGAQnGmdmuEesDvyppStkgAPQ7cb2rm3S5KIL26VQNK8KfkoCsHf9MtgWr2OQKI0LMpz8gASxCNK8xuTdH9A8+RL2Jma2phDwBQva1K/jRyGdy//sXNOGZ1EL8pzeZA4o+kZ186NWgW9LKEsecOnIprlXa77bdBO73vFo6HRrbjQMLKeSmezKCVgfr5uwZB5vhlCuIhWgXYgnmBiM/RxQR0TaPA5pMWM/curYsnWMldwvxuBgnMlwr+aO1CpV1GkFIIeelGitrOXcrpdBDSvv7g7IJ9HlNl628BCz7fZQ/O040ARxiDdMTneqz5a+CijsfYFW0sZCRoGtw7ZWvtFrE2RYi697FlIBvSCsBNKt2vUxGfOS9vEtx1ov+jhbFuzbQnzErpxq/Y0VknkL8SMH3kRUq9svADXn+0ln3CMwRMYzd1KEybNk8fIl2YQYHvNYaXxBXuF8l4TfzGNXW6NUoG6CExScVytbqBKJwS+nZ48lL6EYqBbk55qS2HjzRs= X-Forefront-PRVS: 0244637DEA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(979002)(6069001)(6009001)(39450400003)(7736002)(305945005)(4326008)(53376002)(2361001)(6116002)(3846002)(50466002)(5009440100003)(6306002)(8676002)(966004)(6512007)(81166006)(110136004)(107886003)(25786008)(38730400002)(53936002)(6486002)(6506006)(5003940100001)(50226002)(2906002)(189998001)(2950100002)(5660300001)(6916009)(6666003)(42882006)(48376002)(2351001)(36756003)(33646002)(76176999)(47776003)(66066001)(50986999)(42186005)(7099028)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1713; H:localhost.localdomain.localdomain; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1713; 23:duwUL/2QGsyNYigycA+fICPkrpUsgqiMgwMW1d5?= =?us-ascii?Q?HjFAnTmEuN8O7zgTVa/CdNM2rj52z04wHbK8jVx94r6WHNjS2rwBWpOu/MY4?= =?us-ascii?Q?3ep+daD4p3DkxxxSbKYob64zBdaGPx1SRbNHqSbT9PHQ/HyXQm1lQk+2t7k/?= =?us-ascii?Q?EYMN6+lPu89sxZLFj7oJ4ChhjtyhPNub06k8qHK2WPxD596L7x3wPISFCt6L?= =?us-ascii?Q?Gc3SsxNMpMudEHmR/q/+lgcXYSe75v2x8ECSCQ7kn78i8i7RlMJt7ZOcNWNk?= =?us-ascii?Q?gmQVgxEvBgXt+D4JpnOaV4NfvWl2lQoogbrI/Q0R9lWTeZRCQwEffzsp80PN?= =?us-ascii?Q?DOuu8ppbZon7oUIbtwKya26MsDL/zCbycdAK21qUytZ46XNGIuWA4m4Xi620?= =?us-ascii?Q?rT9F6cHABej+Lm8DMOXZmIySfVCQM2kpV8l8ihnXD9L/raINav5m4QTco8Gt?= =?us-ascii?Q?x0BGVQWAs0FJyNLKDVpXNqhsZmy4RpWTXseM36CM9ITOD+JS97GlduSJMXcQ?= =?us-ascii?Q?cAFHUdcZxX4XpOIg+Wxo+QJ6KPuAgjNh/+5YZ8G1HW2dqoaOwoz00l6eJgnB?= =?us-ascii?Q?I6pOSFRIJvfwH9RAUANmlJdb7K7xIfNO5j4+7yKpAO2X4ncSplET0zNn34EO?= =?us-ascii?Q?imN5rJ0t1YVQDxmBdJaZ183iM6wOBpq1OWQIcLWRQs4x+Sxffa2HyVW46kS1?= =?us-ascii?Q?ABMDZCUizLpWUiRiP41mI6NZqfe9kJaaDsfK99DPDK58MRvpKCxOIoQmcVVM?= =?us-ascii?Q?THssPviak8u3ETQ4MpSTj0K3EzWgsRuarh0N2X8nz5RysCsZyNahuiICCJXI?= =?us-ascii?Q?ft6K6CihpktkaTDY3N8r6lnzSeBSE0X7C/V9bxq5ImMVBUOUMN2phXYGpJhn?= =?us-ascii?Q?+HzBhSJDbC8vqEvSD0F8KAgWQV+UJgdOc4uI1WNzZ3eEFLCRXMHuYOEpLzB1?= =?us-ascii?Q?0XvX064xVyjABii3Y5rGxPdMMFpbHMB7I+8yI7F0IRNtxMYEUFLBdSbyEkcV?= =?us-ascii?Q?pEBEAhA1DUlFEOmS5IRtGCQZ+FcBarhlIjn/adjcKyM6834OaKSdrDBiDx1n?= =?us-ascii?Q?jCjiibKuah8I2WzCpA+tKLFSyEQ1WDAHQBuFkb5F33tlGfD8NyVs6iuylJpd?= =?us-ascii?Q?YE0sMXR6B3yIQthESrSElVZgOCFX2LpUp0fkKknNfCXh8G3r68fUtDjS3FTD?= =?us-ascii?Q?vj1IxTeNDKDPICxM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1713; 6:wLfjY9ACbo33UyO+CucwZGn/1ozfGJXsENa5xlf9e2aLpvDHLbLfDg52WxxA1j2JNR8Cwf8A0psKKurdzpNeI7aNo1bmbddSbJKGSnY2MF4+88fCxwgTElBXtQsvgUTIzbUerWBqOOP3PsLfb9jK6Lbzz25TjuQ2h3Fks7BK9M5cILw+Gfd/Le6TBGbJrGnRUGZnAjJ1U4Z91Y94gSJ9Fe3lB8bbk1+Ge0JZFBO35cc5fxaYJZeg2jI9XSAkWID0JKHW0k1luI4oEV7gW/o2Sqru81qWg589VRKjA5vPrcZ1YRfX5lwcbYwFTxB1kPk6ePvDEXlnDvxIqK5HiZtK+Kwrero4LfhN+oiBk9Awlo/t34BbnVgc60CCSX/SA/bfUuCo3TZYz6pnC19KWITUtA==; 5:753bNsJGHHeHqy8qE1a/UYLd01DRpmf/G0gMvQe+q4FRAO4b9AEIJKBu1jJ5J30VucwCmqtUCB/a9S/d5A2TSMbnwBLBDHYK3au/770pBTgxMTtNNNYN8vdnZKsPPWeYNy5jArK25sncTV7UxZOyKw==; 24:m76RzO1EIF6W7gJTaKiSK55iB0zvFXD2fbWa9IVesfV546fNcz9Jys85reFBVOHg3zxDa9jtSgnm99zgBZ/FMc/wWoBYNgiG/qXs0yDuNLc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1713; 7:m/r+Bxggr+t2P3YSG39kTZsWh/10yONMXdDqgRilphrt8F/E7wAQuKIV8pcGAuVP8tD6I8Xyza0+9uwwWqPYSySNI5p676S9x46gaBq5IkGq6s2Tm4wut36bFzliMgPuRdjq0VLEaajaI+BaoB3ZICafffi7sAL8Fvjx6sPD60HMFmfs/dWacilc+Q3Uy66ix/GuBk20tufTpde7OTjlS01WmG58qE8t29LiztzHfSYSZr785bhyF++8KxJ28oFvp401npX7F7HIvycM7/xuLCqHZPPrsL9fuj+tcAvEyTaXPTi0Xb4ssJsGi/hoJF3w0dchMwafL5oTjD20UXEu/A== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2017 14:03:06.8341 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1713 Subject: [dpdk-dev] [PATCH v2 2/3] net/thunderx: fix build issues with FreeBSD target X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2017 14:03:11 -0000 SIMPLEQ_* operations are not available in FreeBSD. Replacing with equivalent STAILQ_* operations. Fixes: f2546f8e51b8 ("net/thunderx/base: add functions to store qsets") Signed-off-by: Jerin Jacob --- v2: Fix FreeBSD build issues reported by http://dpdk.org/ml/archives/test-report/2017-March/013454.html --- drivers/net/thunderx/base/nicvf_bsvf.c | 12 ++++++------ drivers/net/thunderx/base/nicvf_bsvf.h | 2 +- drivers/net/thunderx/nicvf_ethdev.c | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/thunderx/base/nicvf_bsvf.c b/drivers/net/thunderx/base/nicvf_bsvf.c index 9e028a3..49a2646 100644 --- a/drivers/net/thunderx/base/nicvf_bsvf.c +++ b/drivers/net/thunderx/base/nicvf_bsvf.c @@ -37,7 +37,7 @@ #include "nicvf_bsvf.h" #include "nicvf_plat.h" -static SIMPLEQ_HEAD(, svf_entry) head = SIMPLEQ_HEAD_INITIALIZER(head); +static STAILQ_HEAD(, svf_entry) head = STAILQ_HEAD_INITIALIZER(head); void nicvf_bsvf_push(struct svf_entry *entry) @@ -45,7 +45,7 @@ nicvf_bsvf_push(struct svf_entry *entry) assert(entry != NULL); assert(entry->vf != NULL); - SIMPLEQ_INSERT_TAIL(&head, entry, next); + STAILQ_INSERT_TAIL(&head, entry, next); } struct svf_entry * @@ -53,14 +53,14 @@ nicvf_bsvf_pop(void) { struct svf_entry *entry; - assert(!SIMPLEQ_EMPTY(&head)); + assert(!STAILQ_EMPTY(&head)); - entry = SIMPLEQ_FIRST(&head); + entry = STAILQ_FIRST(&head); assert(entry != NULL); assert(entry->vf != NULL); - SIMPLEQ_REMOVE_HEAD(&head, next); + STAILQ_REMOVE_HEAD(&head, next); return entry; } @@ -68,5 +68,5 @@ nicvf_bsvf_pop(void) int nicvf_bsvf_empty(void) { - return SIMPLEQ_EMPTY(&head); + return STAILQ_EMPTY(&head); } diff --git a/drivers/net/thunderx/base/nicvf_bsvf.h b/drivers/net/thunderx/base/nicvf_bsvf.h index 5d5a25e..fb9b248 100644 --- a/drivers/net/thunderx/base/nicvf_bsvf.h +++ b/drivers/net/thunderx/base/nicvf_bsvf.h @@ -41,7 +41,7 @@ struct nicvf; * The base queue structure to hold secondary qsets. */ struct svf_entry { - SIMPLEQ_ENTRY(svf_entry) next; /**< Next element's pointer */ + STAILQ_ENTRY(svf_entry) next; /**< Next element's pointer */ struct nicvf *vf; /**< Holder of a secondary qset */ }; diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index 1060319..fa1cb32 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include -- 2.5.5