summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vnet/vnet/devices/dpdk/node.c2
-rw-r--r--vnet/vnet/vcgn/cnat_db_v2.c4
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_udp_inside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c2
-rw-r--r--vnet/vnet/vcgn/cnat_logging.c19
-rw-r--r--vnet/vnet/vcgn/cnat_util.c1
-rw-r--r--vnet/vnet/vcgn/cnat_v4_functions.c2
-rw-r--r--vnet/vnet/vcgn/spp_platform_trace_log.c2
12 files changed, 19 insertions, 23 deletions
diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c
index fde0eb23..f05c37fe 100644
--- a/vnet/vnet/devices/dpdk/node.c
+++ b/vnet/vnet/devices/dpdk/node.c
@@ -932,7 +932,7 @@ vlib_get_handoff_queue_elt (u32 vlib_worker_index)
return elt;
}
-inline vlib_frame_queue_elt_t *
+static inline vlib_frame_queue_elt_t *
dpdk_get_handoff_queue_elt (
u32 vlib_worker_index,
vlib_frame_queue_elt_t ** handoff_queue_elt_by_worker_index)
diff --git a/vnet/vnet/vcgn/cnat_db_v2.c b/vnet/vnet/vcgn/cnat_db_v2.c
index c09a73eb..5a26fd99 100644
--- a/vnet/vnet/vcgn/cnat_db_v2.c
+++ b/vnet/vnet/vcgn/cnat_db_v2.c
@@ -176,7 +176,7 @@ void cnat_table_entry_fill_map(u32 start_addr, u32 end_addr,
void cnat_delete_session_db_entry (cnat_session_entry_t *ep, u8 log);
-inline void handle_cnat_port_exceeded_logging(
+void handle_cnat_port_exceeded_logging(
cnat_user_db_entry_t *udb,
cnat_key_t * key,
cnat_vrfmap_t *vrfmap);
@@ -3025,7 +3025,7 @@ static inline void handle_dslite_port_exceeded_logging(
}
#endif
-inline void handle_cnat_port_exceeded_logging(
+void handle_cnat_port_exceeded_logging(
cnat_user_db_entry_t *udb,
cnat_key_t * key,
cnat_vrfmap_t *vrfmap)
diff --git a/vnet/vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c b/vnet/vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c
index 218d7e53..998663d7 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_icmp_error_inside_input.c
@@ -62,7 +62,7 @@ vlib_node_registration_t cnat_ipv4_icmp_e_inside_input_node;
#define NSTAGES 5
-inline void swap_ip_src_emip_dst(ipv4_header *ip,
+void swap_ip_src_emip_dst(ipv4_header *ip,
icmp_em_ip_info *icmp_info,
cnat_main_db_entry_t *db, u16 vrf)
{
diff --git a/vnet/vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c b/vnet/vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c
index f25f4d02..ae856da1 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_icmp_error_outside_input.c
@@ -62,7 +62,7 @@ vlib_node_registration_t cnat_ipv4_icmp_e_outside_input_node;
#define NSTAGES 5
-inline void swap_ip_dst_emip_src(ipv4_header *ip,
+void swap_ip_dst_emip_src(ipv4_header *ip,
icmp_em_ip_info *icmp_info,
cnat_main_db_entry_t *db, u16 vrf)
{
diff --git a/vnet/vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c b/vnet/vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c
index 1b9f0266..0d261bf0 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_icmp_query_inside_input.c
@@ -65,7 +65,7 @@ vlib_node_registration_t cnat_ipv4_icmp_q_inside_input_node;
#define NSTAGES 5
-inline void swap_ip_src_icmp_id(ipv4_header *ip,
+void swap_ip_src_icmp_id(ipv4_header *ip,
icmp_v4_t *icmp,
cnat_main_db_entry_t *db, u16 vrf)
{
diff --git a/vnet/vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c b/vnet/vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c
index 2c05e0b4..62b95f7c 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_icmp_query_outside_input.c
@@ -64,7 +64,7 @@ vlib_node_registration_t cnat_ipv4_icmp_q_outside_input_node;
#define NSTAGES 5
-inline void swap_ip_dst_icmp_id(ipv4_header *ip,
+void swap_ip_dst_icmp_id(ipv4_header *ip,
icmp_v4_t *icmp,
cnat_main_db_entry_t *db, u16 vrf)
{
diff --git a/vnet/vnet/vcgn/cnat_ipv4_udp_inside_input.c b/vnet/vnet/vcgn/cnat_ipv4_udp_inside_input.c
index 657c5f1e..246bec1d 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_udp_inside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_udp_inside_input.c
@@ -111,7 +111,7 @@ is_pcp_pkt(spp_ctx_t *ctx, u32 addr, u16 port)
}
#endif
-inline void swap_ip_src_udp_port(ipv4_header *ip,
+void swap_ip_src_udp_port(ipv4_header *ip,
udp_hdr_type_t *udp,
cnat_main_db_entry_t *db)
{
diff --git a/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c b/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c
index 203568c8..5783314a 100644
--- a/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c
+++ b/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c
@@ -177,7 +177,7 @@ inline void swap_ip_dst(ipv4_header *ip,
#endif
}
-inline void swap_ip_dst_udp_port(ipv4_header *ip,
+void swap_ip_dst_udp_port(ipv4_header *ip,
udp_hdr_type_t *udp,
cnat_main_db_entry_t *db, u16 vrf)
{
diff --git a/vnet/vnet/vcgn/cnat_logging.c b/vnet/vnet/vcgn/cnat_logging.c
index eace942c..f46dd0ac 100644
--- a/vnet/vnet/vcgn/cnat_logging.c
+++ b/vnet/vnet/vcgn/cnat_logging.c
@@ -310,7 +310,7 @@ cnat_nfv9_dump_logging_context (u32 value1,
* Argument: u8 *new_addr, u8 *org_addr
* returns the difference
*/
-inline
+
int cnat_nfv9_pad_added_to_an_addr(u8 *new_addr, u8 *org_addr)
{
uword addr1 = (uword) new_addr;
@@ -326,7 +326,7 @@ int cnat_nfv9_pad_added_to_an_addr(u8 *new_addr, u8 *org_addr)
* Argument: u8 * data_ptr
* pointer to the data pointer
*/
-inline
+
u8 *cnat_nfv9_add_end_of_record_padding (u8 *data_ptr)
{
uword tmp = (uword) data_ptr;
@@ -345,7 +345,7 @@ u8 *cnat_nfv9_add_end_of_record_padding (u8 *data_ptr)
* Argument: u8 * data_ptr
* pointer to the data pointer
*/
-inline
+
u16 cnat_nfv9_pad_end_of_record_length (u16 record_length)
{
u16 pad_value = NFV9_PAD_VALUE;
@@ -419,7 +419,7 @@ void fill_ip_n_udp_hdr (u32 ipv4_addr, u16 port,
* Argument: cnat_nfv9_logging_info_t *nfv9_logging_info
* structure that contains the packet context
*/
-inline
+
void cnat_nfv9_fill_nfv9_ip_header (cnat_nfv9_logging_info_t *nfv9_logging_info)
{
u16 new_record_length = 0;
@@ -488,7 +488,7 @@ void cnat_nfv9_fill_nfv9_ip_header (cnat_nfv9_logging_info_t *nfv9_logging_info)
* Argument: cnat_nfv9_logging_info_t *nfv9_logging_info
* structure that contains the packet context
*/
-inline
+
void cnat_nfv9_send_queued_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
{
}
@@ -503,7 +503,7 @@ void cnat_nfv9_send_queued_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
* Argument: cnat_nfv9_logging_info_t *nfv9_logging_info
* structure that contains the packet context
*/
-inline
+
void cnat_nfv9_send_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
{
cnat_nfv9_fill_nfv9_ip_header(nfv9_logging_info);
@@ -606,7 +606,7 @@ inline void send_vpp3_nfv9_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
/*
* send_vpp3_nfv9_pkt: to send one b0 in a frame
*/
-inline void send_vpp3_nfv9_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
+void send_vpp3_nfv9_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
{
vlib_node_t *output_node;
vlib_main_t *vm = vlib_get_main();
@@ -647,7 +647,7 @@ inline void send_vpp3_nfv9_pkt (cnat_nfv9_logging_info_t *nfv9_logging_info)
* Argument: vlib_node_t *output_node
* vlib_node_t structure for rewrite_output node
*/
-inline
+
void cnat_nfv9_send_pkt_always_success (
cnat_nfv9_logging_info_t *nfv9_logging_info,
vlib_node_t *output_node)
@@ -722,7 +722,7 @@ void cnat_nfv9_send_pkt_always_success (
* structure that contains the nfv9 logging info and will store
* the packet context as well.
*/
-inline
+
void cnat_nfv9_create_logging_context (
cnat_nfv9_logging_info_t *nfv9_logging_info,
cnat_nfv9_template_add_flag_t template_flag)
@@ -851,7 +851,6 @@ void cnat_nfv9_create_logging_context (
}
}
-inline
void cnat_nfv9_record_create (
cnat_nfv9_logging_info_t *nfv9_logging_info, u16 cur_record)
{
diff --git a/vnet/vnet/vcgn/cnat_util.c b/vnet/vnet/vcgn/cnat_util.c
index 2415c543..c3697b6b 100644
--- a/vnet/vnet/vcgn/cnat_util.c
+++ b/vnet/vnet/vcgn/cnat_util.c
@@ -2132,7 +2132,6 @@ int icmpv6_generate_with_throttling_v1 (spp_ctx_t *ctx, ipv6_header_t *ipv6,
}
#endif
-inline
void calculate_window_scale(tcp_hdr_type *tcp_header, u8 *scale) {
u8 check_options = 0;
diff --git a/vnet/vnet/vcgn/cnat_v4_functions.c b/vnet/vnet/vcgn/cnat_v4_functions.c
index d3051fba..bb25f5ef 100644
--- a/vnet/vnet/vcgn/cnat_v4_functions.c
+++ b/vnet/vnet/vcgn/cnat_v4_functions.c
@@ -264,7 +264,7 @@ print_tcp_pkt (ipv4_header *ip)
* ip & tcp checksum update (incremental)
*/
-inline void tcp_in2out_nat_mss_n_checksum (ipv4_header * ip,
+void tcp_in2out_nat_mss_n_checksum (ipv4_header * ip,
tcp_hdr_type * tcp,
u32 ipv4_addr,
u16 port,
diff --git a/vnet/vnet/vcgn/spp_platform_trace_log.c b/vnet/vnet/vcgn/spp_platform_trace_log.c
index 2c119f06..8d1f49bf 100644
--- a/vnet/vnet/vcgn/spp_platform_trace_log.c
+++ b/vnet/vnet/vcgn/spp_platform_trace_log.c
@@ -397,7 +397,6 @@ u32 spp_trace_log_get_sys_up_time_in_ms (void)
return (sys_up_time);
}
-inline
u32 spp_trace_log_get_unix_time_in_seconds (void)
{
spp_node_main_vector_t *nmv;
@@ -978,7 +977,6 @@ void spp_printf(u16 error_code, u16 num_args, u32 *arg)
/* To be filled */
}
-inline
u32 spp_trace_log_get_unix_time_in_seconds (void)
{
vlib_main_t *vlib_main;