From: x-fn-spp@sl.ntt-tx.co.jp
To: ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Cc: spp@dpdk.org
Subject: [spp] [PATCH 15/23] spp_vf: add include header files
Date: Wed, 21 Nov 2018 10:35:50 +0900 [thread overview]
Message-ID: <201811210136.wAL1a12u009672@imss03.silk.ntt-tx.co.jp> (raw)
In-Reply-To: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp>
From: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp>
Add include paths for common files and 'spp_vf.c' for previous changes.
Signed-off-by: Hideyuki Yamashita <yamashita.hideyuki@po.ntt-tx.co.jp>
Signed-off-by: Naoki Takada <takada.naoki@lab.ntt.co.jp>
---
src/vf/common/command_conn.h | 2 ++
src/vf/common/command_dec.h | 2 ++
src/vf/common/command_proc.c | 2 ++
src/vf/common/command_proc.h | 2 ++
src/vf/common/ringlatencystats.c | 1 +
src/vf/common/spp_port.h | 2 ++
src/vf/common/spp_proc.c | 9 ++-------
src/vf/spp_vf.c | 2 ++
8 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/vf/common/command_conn.h b/src/vf/common/command_conn.h
index 3e56570..517c0e9 100644
--- a/src/vf/common/command_conn.h
+++ b/src/vf/common/command_conn.h
@@ -12,6 +12,8 @@
* Command connection management.
*/
+#include "spp_proc.h"
+
/** result code - temporary error. please retry */
#define SPP_CONNERR_TEMPORARY -1
/** result code - fatal error occurred. should terminate process. */
diff --git a/src/vf/common/command_dec.h b/src/vf/common/command_dec.h
index 84644f2..93b4ebe 100644
--- a/src/vf/common/command_dec.h
+++ b/src/vf/common/command_dec.h
@@ -12,6 +12,8 @@
* Decode and validate the command message string.
*/
+#include "spp_proc.h"
+
/** max number of command per request */
#define SPP_CMD_MAX_COMMANDS 32
diff --git a/src/vf/common/command_proc.c b/src/vf/common/command_proc.c
index d1c04db..1331400 100644
--- a/src/vf/common/command_proc.c
+++ b/src/vf/common/command_proc.c
@@ -10,6 +10,8 @@
#include "spp_port.h"
#include "string_buffer.h"
+#include "../classifier_mac.h"
+#include "../spp_forward.h"
#include "command_conn.h"
#include "command_dec.h"
#include "command_proc.h"
diff --git a/src/vf/common/command_proc.h b/src/vf/common/command_proc.h
index 9e261f3..5e846a3 100644
--- a/src/vf/common/command_proc.h
+++ b/src/vf/common/command_proc.h
@@ -13,6 +13,8 @@
* result JSON formatted data.
*/
+#include "spp_proc.h"
+
/**
* initialize command processor.
*
diff --git a/src/vf/common/ringlatencystats.c b/src/vf/common/ringlatencystats.c
index 1483a7e..6ea5a7e 100644
--- a/src/vf/common/ringlatencystats.c
+++ b/src/vf/common/ringlatencystats.c
@@ -15,6 +15,7 @@
#include <rte_memcpy.h>
#include "ringlatencystats.h"
+#include "spp_proc.h"
#define NS_PER_SEC 1E9
diff --git a/src/vf/common/spp_port.h b/src/vf/common/spp_port.h
index a59feca..10409ab 100644
--- a/src/vf/common/spp_port.h
+++ b/src/vf/common/spp_port.h
@@ -12,6 +12,8 @@
* Provide about the ability per port.
*/
+#include "spp_proc.h"
+
/** Calculate TCI of VLAN tag. */
#define SPP_VLANTAG_CALC_TCI(id, pcp) (((pcp & 0x07) << 13) | (id & 0x0fff))
diff --git a/src/vf/common/spp_proc.c b/src/vf/common/spp_proc.c
index a6ddeb6..87fb9d3 100644
--- a/src/vf/common/spp_proc.c
+++ b/src/vf/common/spp_proc.c
@@ -14,8 +14,8 @@
#include "spp_proc.h"
#include "spp_port.h"
-#include "../vf/spp_forward.h"
-#include "../vf/classifier_mac.h"
+#include "../spp_forward.h"
+#include "../classifier_mac.h"
/* Manage data to addoress */
struct manage_data_addr_info {
@@ -880,15 +880,10 @@ flush_component(void)
component_info = (p_component_info + cnt);
spp_port_ability_update(component_info);
-#ifdef SPP_VF_MODULE
if (component_info->type == SPP_COMPONENT_CLASSIFIER_MAC)
ret = spp_classifier_mac_update(component_info);
else
ret = spp_forward_update(component_info);
-#endif /* SPP_VF_MODULE */
-#ifdef SPP_MIRROR_MODULE
- ret = spp_mirror_update(component_info);
-#endif /* SPP_MIRROR_MODULE */
if (unlikely(ret < 0)) {
RTE_LOG(ERR, APP, "Flush error. "
"( component = %s, type = %d)\n",
diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c
index 63ad71a..7ceb88f 100644
--- a/src/vf/spp_vf.c
+++ b/src/vf/spp_vf.c
@@ -6,10 +6,12 @@
#include <arpa/inet.h>
#include <getopt.h>
+#include "spp_proc.h"
#include "spp_vf.h"
#include "classifier_mac.h"
#include "spp_forward.h"
#include "command_proc.h"
+#include "command_dec.h"
#include "spp_port.h"
/* Declare global variables */
--
2.18.0
next prev parent reply other threads:[~2018-11-21 1:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp>
2018-11-21 1:35 ` [spp] [PATCH 01/23] spp_vf: fix invalid code for max chars x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 02/23] spp_vf: move common source and header files x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 03/23] spp_vf: change include path x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 04/23] spp_vf: update Makefile for common files x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 05/23] spp_vf: move functions to common directory x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 06/23] spp_vf: move defines to common dir x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 07/23] spp_vf: move functions for decode " x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 08/23] spp_vf: move defines " x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 09/23] spp_vf: move functions to command_proc.c x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 10/23] spp_vf: add management data registration x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 11/23] spp_vf: change reference of management data x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 12/23] spp_vf: change return values to explain result x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 13/23] spp_vf: define terms of commands as consts x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 14/23] spp_vf: remove unnecessary includes x-fn-spp
2018-11-21 1:35 ` x-fn-spp [this message]
2018-11-21 1:35 ` [spp] [PATCH 16/23] spp_vf: update comments for header file x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 17/23] spp_vf: update makefile of spp_vf x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 18/23] spp_vf: add check num of ports before forwarding x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 19/23] spp_vf: add flag for classifier table x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 20/23] spp_vf: add checking the number of ports x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 21/23] spp_vf: add vlantag command check flag x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 22/23] spp_vf: simplify changing VLAN tag x-fn-spp
2018-11-21 1:35 ` [spp] [PATCH 23/23] spp_vf: add SPP_VF_MODULE preprocessor directive x-fn-spp
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=201811210136.wAL1a12u009672@imss03.silk.ntt-tx.co.jp \
--to=x-fn-spp@sl.ntt-tx.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=ogawa.yasufumi@lab.ntt.co.jp \
--cc=spp@dpdk.org \
/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).