From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, Jerin Jacob <jerin.jacob@caviumnetworks.com>
Subject: [dpdk-dev] [PATCH v2 2/3] net/thunderx: fix build issues with FreeBSD target
Date: Sun, 12 Mar 2017 19:32:31 +0530 [thread overview]
Message-ID: <1489327352-31938-2-git-send-email-jerin.jacob@caviumnetworks.com> (raw)
In-Reply-To: <1489327352-31938-1-git-send-email-jerin.jacob@caviumnetworks.com>
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 <jerin.jacob@caviumnetworks.com>
---
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 <inttypes.h>
#include <netinet/in.h>
#include <sys/queue.h>
-#include <sys/timerfd.h>
#include <rte_alarm.h>
#include <rte_atomic.h>
--
2.5.5
next prev parent reply other threads:[~2017-03-12 14:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 15:39 [dpdk-dev] [PATCH 1/2] net/thunderx: fix build issues with 32bit target Jerin Jacob
2017-03-10 15:39 ` [dpdk-dev] [PATCH 2/2] config: enable the thunderx nicvf driver Jerin Jacob
2017-03-12 14:02 ` [dpdk-dev] [PATCH v2 1/3] net/thunderx: fix build issues with 32bit target Jerin Jacob
2017-03-12 14:02 ` Jerin Jacob [this message]
2017-03-12 14:02 ` [dpdk-dev] [PATCH v2 3/3] config: enable the thunderx nicvf driver Jerin Jacob
2017-03-19 14:48 ` [dpdk-dev] [PATCH v3 1/3] net/thunderx: fix build issues with 32bit target Jerin Jacob
2017-03-19 14:48 ` [dpdk-dev] [PATCH v3 2/3] net/thunderx: fix build issues with FreeBSD target Jerin Jacob
2017-03-19 14:48 ` [dpdk-dev] [PATCH v3 3/3] config: enable the thunderx nicvf driver Jerin Jacob
2017-03-20 12:21 ` Ferruh Yigit
2017-03-20 12:21 ` [dpdk-dev] [PATCH v3 1/3] net/thunderx: fix build issues with 32bit target Ferruh Yigit
2017-03-15 16:32 ` [dpdk-dev] [PATCH 1/2] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489327352-31938-2-git-send-email-jerin.jacob@caviumnetworks.com \
--to=jerin.jacob@caviumnetworks.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).