From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail04.ics.ntt-tx.co.jp (mail05.ics.ntt-tx.co.jp [210.232.35.69]) by dpdk.org (Postfix) with ESMTP id EA83D5A6E for ; Wed, 21 Nov 2018 02:41:08 +0100 (CET) Received: from gwchk03.silk.ntt-tx.co.jp (gwchk03.silk.ntt-tx.co.jp [10.107.0.111]) by mail04.ics.ntt-tx.co.jp (unknown) with ESMTP id wAL1f7Q8002691; Wed, 21 Nov 2018 10:41:07 +0900 Received: (from root@localhost) by gwchk03.silk.ntt-tx.co.jp (unknown) id wAL1f658004562; Wed, 21 Nov 2018 10:41:06 +0900 Received: from gwchk.silk.ntt-tx.co.jp [10.107.0.110] by gwchk03.silk.ntt-tx.co.jp with ESMTP id LAA01852; Wed, 21 Nov 2018 10:36:01 +0900 Received: from imss03.silk.ntt-tx.co.jp (localhost [127.0.0.1]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id wAL1a195009675; Wed, 21 Nov 2018 10:36:01 +0900 Received: from mgate02.silk.ntt-tx.co.jp (smtp02.silk.ntt-tx.co.jp [10.107.0.37]) by imss03.silk.ntt-tx.co.jp (unknown) with ESMTP id wAL1a12u009672; Wed, 21 Nov 2018 10:36:01 +0900 Message-Id: <201811210136.wAL1a12u009672@imss03.silk.ntt-tx.co.jp> Received: from localhost by mgate02.silk.ntt-tx.co.jp (unknown) id wAL1ZwWh008346 ; Wed, 21 Nov 2018 10:36:01 +0900 From: x-fn-spp@sl.ntt-tx.co.jp To: ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp Cc: spp@dpdk.org Date: Wed, 21 Nov 2018 10:35:50 +0900 X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp> References: <20181121013558.8869-1-x-fn-spp@sl.ntt-tx.co.jp> X-TM-AS-MML: No Subject: [spp] [PATCH 15/23] spp_vf: add include header files X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 01:41:09 -0000 From: Hideyuki Yamashita Add include paths for common files and 'spp_vf.c' for previous changes. Signed-off-by: Hideyuki Yamashita Signed-off-by: Naoki Takada --- 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 #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 #include +#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