Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
l2: fix typo in doxygen
[vpp.git]
/
src
/
vnet
/
l2
/
l2_output_classify.c
diff --git
a/src/vnet/l2/l2_output_classify.c
b/src/vnet/l2/l2_output_classify.c
index
49a589c
..
1e55afc
100644
(file)
--- a/
src/vnet/l2/l2_output_classify.c
+++ b/
src/vnet/l2/l2_output_classify.c
@@
-59,10
+59,12
@@
format_l2_output_classify_trace (u8 * s, va_list * args)
return s;
}
return s;
}
+extern l2_output_classify_main_t l2_output_classify_main;
+
+#ifndef CLIB_MARCH_VARIANT
/** l2 output classifier main data structure. */
l2_output_classify_main_t l2_output_classify_main;
/** l2 output classifier main data structure. */
l2_output_classify_main_t l2_output_classify_main;
-
-vlib_node_registration_t l2_output_classify_node;
+#endif /* CLIB_MARCH_VARIANT */
#define foreach_l2_output_classify_error \
_(MISS, "Classify misses") \
#define foreach_l2_output_classify_error \
_(MISS, "Classify misses") \
@@
-134,9
+136,9
@@
static char *l2_output_classify_error_strings[] = {
* Classifier hits in other than the first table
*/
* Classifier hits in other than the first table
*/
-static uword
-
l2_output_classify_node_fn (vlib_main_t * vm
,
-
vlib_node_runtime_t * node,
vlib_frame_t * frame)
+VLIB_NODE_FN (l2_output_classify_node) (vlib_main_t * vm,
+
vlib_node_runtime_t * node
,
+
vlib_frame_t * frame)
{
u32 n_left_from, *from, *to_next;
l2_output_classify_next_t next_index;
{
u32 n_left_from, *from, *to_next;
l2_output_classify_next_t next_index;
@@
-436,7
+438,6
@@
l2_output_classify_node_fn (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (l2_output_classify_node) = {
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (l2_output_classify_node) = {
- .function = l2_output_classify_node_fn,
.name = "l2-output-classify",
.vector_size = sizeof (u32),
.format_trace = format_l2_output_classify_trace,
.name = "l2-output-classify",
.vector_size = sizeof (u32),
.format_trace = format_l2_output_classify_trace,
@@
-456,9
+457,7
@@
VLIB_REGISTER_NODE (l2_output_classify_node) = {
};
/* *INDENT-ON* */
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (l2_output_classify_node,
- l2_output_classify_node_fn);
-
+#ifndef CLIB_MARCH_VARIANT
/** l2 output classsifier feature initialization. */
clib_error_t *
l2_output_classify_init (vlib_main_t * vm)
/** l2 output classsifier feature initialization. */
clib_error_t *
l2_output_classify_init (vlib_main_t * vm)
@@
-568,6
+567,7
@@
vnet_l2_output_classify_set_tables (u32 sw_if_index,
return 0;
}
return 0;
}
+#endif /* CLIB_MARCH_VARIANT */
static clib_error_t *
int_l2_output_classify_command_fn (vlib_main_t * vm,
static clib_error_t *
int_l2_output_classify_command_fn (vlib_main_t * vm,