From patchwork Sun Mar 19 14:48:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 21982 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 21A34CF62; Sun, 19 Mar 2017 15:49:55 +0100 (CET) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0071.outbound.protection.outlook.com [104.47.37.71]) by dpdk.org (Postfix) with ESMTP id CAE2A5320 for ; Sun, 19 Mar 2017 15:49:22 +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=jVpydZc6WI+3xat4xBTNmtHUw0K91PzgSHK3K2D4+wg=; b=DJ7oUI+jDF4h4WHJXVcq6XVKFS0QteCrtxFXmwKsOGIJpU5MWYy689UnPisx6oO23/I90mLZdBqXoRc7+9knbIKqO3AV/uFbl/I8doS4eQb4mdU0hr7F4J88OMOixFK1hm5Ek8Wr5o9recG4x0erWZL22ZWDZGk8mMwogqQeBv0= 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 (106.201.104.48) by BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.961.17; Sun, 19 Mar 2017 14:49:19 +0000 From: Jerin Jacob To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Jerin Jacob Date: Sun, 19 Mar 2017 20:18:47 +0530 Message-Id: <1489934928-27131-2-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1489934928-27131-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1489327352-31938-1-git-send-email-jerin.jacob@caviumnetworks.com> <1489934928-27131-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [106.201.104.48] X-ClientProxiedBy: BMXPR01CA0002.INDPRD01.PROD.OUTLOOK.COM (10.174.214.140) To BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) X-MS-Office365-Filtering-Correlation-Id: fa73bfa2-0c40-4d0f-ff69-08d46ed7208f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 3:aj6YN777uILlhInLTkBvxM+DEoJGjcXPTkMUagx81xDSaWasqlLTdUEr7PgyBCh1R6IRA9P5KFDnOVZqxYx6GBm1DMJ/TlTJKzP1uDAdBotYdW4c5HOmCFMoyVRUL/bjU5ljg61i88fGzdMt8Cl8gXDE77W33rqzYgRM2kpK1fvtnPCdAV98rZGSzjTqz4MpW3TvBnyj+BPOBE513IJL1H484PjeN4Yu4uX45x25YT/vHAQ/rIRrT1b8CmNXKzVLFWv5khtjZAqwqOAR09d1lg==; 25:OxTRBRXfmmcv9jK8pNoVW36diYGyYXgD8MoryWaUzbILf/f5dDxjnauea1xY9u6rCGnrj+6W5EubZ95xQnewC3PXXTnxqChVVsbja6/IuBfAtbH6fNM56ijMesC6BKyac4LmVW09Cmd84K87Mxd0aBhieDUMOF3VQIJY9X89GRhKG1Vff9MmkmMi67X3cG3PxHCq5UzVfTEWSZM5mC2Qs0SvHQeOmxsIF2T6Ffg4Nq0rXru96lYTe5mWbnfBhvHfClWVBbARWbooaDKqaPESlavKVRXHUZ88eUx+PKPqPASzUzRBwK1LboTZZ/38k53QraG6OebEiVsgHCL5TFwgbdazDJgrYA9U141XPeE+sd5pj0BXwwl2NzUtD4Ooiq3cUuO4TEXRRTY5OPxEhgiIjM9+ESU3KYPFEoJS2I9D0dGjPhn6CHZWQag8hNqV+alDtXlifgvorp3iHOwMlqt4CQ== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 31:kSCVQwGbAxSF1Tuq7zO16LwSVvoSzLkDegDyb5YUITyHVURTAMlWV812uHZ8RBkef1eiUqeV/ifj/BqeoTACHpMl3y+CeycL78icmM1looRi22Nu9Pks4o19l1ceFcmRahBy0mrgLQC+sfmNkF6WSykQ1xteP1hgpVSpG5eTIKy+tVLA5W8W9Llol/zca1lluxwt6MHkihC9FR2Y4z9h+wrQDa5obOsV37fKd7RCjVU=; 20:emz0mHfSzw7DN+TW375pAacUBxuGrerw2aF6Ik/AlKzlRUFtlF3Nhd59kRHSvF///t62+q0yBPttYKtmd2i7RZ/0VLFCWNZ3nPyCznBa2mrM5J+WFx5QD+rpf7sc/t1f3gWoE1B138vAREVD8dvmeR+rfdkJf6D8ImDDTcS8gMR+Hs3lDqGjyt3+em22gRjWbEaqiW1tz1XMGKqnVMAkZ0/WfXxlMlzglwSh4GoasK6YKPV7URC4EQHTwesT4jzCyVBv8xApz5cNNoytEEnZNKkmqd350lFwFjBWMtHbAnL3OQ3spjdxaKk+vrAcLF+IG4jg3Bqw23QniVyu7+dmxoCNghiebpPHtnbARqRi3G68l72ksOIZOnw8hgV+JcoXx0aaRy6KezBKsLBOTNzFuf1xltC46gNjstJTXdxXb/5qId6lFwjE2IOrP8QA7zb12gyjBTTH0UfOBQ//bwzkBgr9606o/m1wzXqx5CgafkdSryXmplBsFh13Ub9Z9X9uFtZtDJkfKiEIiK5+BhOT7IRp1ggmm1rJiV+h01dgttXpfDXJjh1Ws2CGDjrXB4pCfdqxBiJtTJP140GAihiR6i+AnCSuOFkMkZq+FP+PPmw= 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)(20161123562025)(20161123564025)(20161123560025)(6072148); SRVR:BY1PR0701MB1724; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1724; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 4:Hy/CSSNvfN0quiDdJTaX4Ll+OoVMOEVYsdAIxGL1j6JH0+c3tlEMjS3455PcEzpo+xg0Yh83M2ClWDB9fH7CMjZn6nkx3CtFioI4t2Lf8zbyZKwA2+7Vk6IytucsFDfbCvMi7TcnKGlH/nwY6icNJn26Q3tT8TKsw02AZWRm3m2V+DeAWzf/a2smigeXYlQrWGXS5fmyV3CO5b855vWmHu/SGsQBXAvQU73nEFIf0kQonJnOGP69x3vyepRs3EcySXt/9D294L7YmG3loQ20pZbiqqPICLPPQbyEVQOcR19hTC8tY2exjZL9Bi/fEAAkDt7iLQ+XjQnXYL+deiF1ALTUbXyIpCFKMD+kZw98mrzHePJAB+xjuTajbIKCUsKpfP6Ay3plVPxhoXkqb3cx9lUUhUQYZz2eRLssW/RiTVBb43UVFp6r0zTWg94vXesg5XcFF6gEPnw9rVHccPi39f2MVlMDSerHTDKP1ClJB+FXwmyv0emexQqITnHf62xNebRVzDjQLR5yqvWW7Jtfk6jfRtBitpJMZ6MlNWPyAqFUCiCXBObOYVXN5xy0bkGymakvMEXDXieIvRilrHIOc/q+1kLFSSOAXGUffVichLk= X-Forefront-PRVS: 025100C802 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(39410400002)(39450400003)(39830400002)(38730400002)(107886003)(110136004)(2950100002)(42882006)(53936002)(6916009)(48376002)(25786008)(5660300001)(6666003)(6512007)(2906002)(36756003)(2361001)(42186005)(50466002)(33646002)(6486002)(4326008)(6506006)(47776003)(66066001)(2351001)(7736002)(189998001)(50226002)(3846002)(6116002)(76176999)(8676002)(50986999)(81166006)(305945005)(5009440100003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1724; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0701MB1724; 23:OPwX70qeeUwBs0qSgIKoYhVwM3H5qdEnn6MTu24?= RfYSO2zoKN/Q85NmWdV+1R6NkeZ/cH0M48Kn2RMwCl963yCTyVXvgRA9O2bZkRkEePGneS9CyRva4m6RAI9xtrgBrGx1Ce2S7AwrRpBhYCGManriHaKPNw1l02c+80fnwS1DnO+Uxy4xAB8STNd30nlfRn4+QyJtnB7m8o7HA+ST9SyM+9TZFqI5GdKvGx6V/vuEDOKVfjCR6PYK7AmG0CL2Mo6lOUCYe+qwFLw0DJ+mx9jtyi72ARWuUqwBxn24wcIrHe/mdZpU1ybsyGNM1YVj2Td2yj2n8nwVsfHEb1X55WZvtm/3Wq5W/TdsWW859GQ26rLus4xLltcXfOWLM5OLENf7VqacT8R26edADy8BvnhReLUEhiHyV0dtMQ/CtEuWnKoyiAoQU50MZLSO5tX4IeaX+3KhiV7gBg/o+UXCCJovKoUcLwvgGDr65Cf99W4vY+kRemcNJYQ7JU2gU1520HCHg0vNnNDdjQqtKlVE2LcK3us08ncVdBuphf3IFvKtAh/aYNrmGh0T9HGhjFaQaCn7SsW5ArHN0xD0RRuPyE+kq6lWYvVW3lhHeSJCHxJlBRuxMechaLMz4qbpe8R56HX4BYgMwCvxGXb0EDoLZlOel7CeEAp6DyHxJAeFEcvo2nnxblVByD0xl2eZlLu5sSW4cduM1lQ6YbgNrQ61q6aKD2mdDUuEhjZHb5cqundb+BMkCqlUn9eDyujT5RxLtNYDIlRq8M1/aDPS1FQyl0LD7To74YQ9dbmXN007/zZz3t7CgcVhIifUyg0fXl4gZ70My60LtRxxSYp1ShOpE2IV3O2Qyv89eknT7lHRURRtJxty7NOwGGJTHVB8oYUPHXSmXyKf3eD85S+qy4vSn49bM45vCdJ8Z/ki7rqNQpJ1AhV1I6j1ki4QbPSI5G2BbZuTfdPfy95XCUFQMP1OBDYosX48JwVw+abPlqlS61wNcglOFt3OvAdOa1Ef3rXMQtkHGUm1JMTPvWQj3m8W8/Q== X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 6:Sj6ahSNI8rOQcjdfVlRMb56gmqdtfdMKUzVcpfCXSCdZuhI8WHkOtvVWxQGKReLdrTLacFEHYx1cZu0FwYq8C6c5zy3FkDDBKpFET4dLyQsmNbfKClSXGF/ndYhu+6sLzIej98zNNihRsL4PVxTgxDf5dpgsZH6Zj8Pt8mlEfHGeeROpyFq6ydIA/eSHNHkbJH+kuosubjOF3hUZinR2AYiHGl5DfamrxI4D8+qQ7r3Sjt5TIppEWNKpyicG9TB8bZpkbjzsXYdYeRxyAe6id/eTUERswFJrl9Q/JFCCCIptV9JNWDK5fvKJkceRPwXxvyrtI4yCVWf3xbN9vv03OH4mNpBWozHdiKGH3frs4S6VfnK/WRdJ3eZmi6gN1r6j58Fxy+mNrLqkv9X6ZD0DsQ==; 5:RB0myTx6ctNSl4XXA9O2Slxt5lObYlRpzBm1ipvSKaPYE7bWr+QlE6cl2qvSvHUK3A+ZfhfQFtocWGSAm+w3LnOxZx/bPSa3wkDAbY7XVkD4hb5G1mF7ubyjSfihHgF7ACre820kN/voabXPkm1ljA==; 24:h/EllfoRGXsKPERdq4NkF7RM82A2QzcOJOwePhReb8nemNGZPdl1ELb4VixJUw3XmOO9hXMS2/8XDH0qx1/AK3YYtj5H9JvxX6qm9dEEanw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724; 7:4yIqOyBh/bG06Kcx5Kp2aSCRYoGbIBML5YMkms6Ov/uw39vvRZbrrmEs6EWhiMRY3U5JN4lej5McfKLsTaQBhqk91jF6nDcV9yZd3/HduoSD0OFMsjhmcj8/poR7kfpB+4tVirt4EGcoTXeMtQFaiCqMVnRUlbwwfY00x8tq6YODFL12vqkM9Oq8E7AiyaNVeOiSJXipuhrwAx8vicaUp0jPcj3cn/FWA5IbTENCkBZPLWHEMx8LXD4KUTdH6YB63oQD5GtRzD18oP193JZlnvpxM20LCmSjCQYVAd8+xWRyKWMY3c++d9alVXX4CEAc1YTGOEGhzlwQgh6b90h2UA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2017 14:49:19.3771 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1724 Subject: [dpdk-dev] [PATCH v3 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 871b4f0..5f34237 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