api: refactor to use REPLY_MSG_ID_BASE #define

[vpp.git] / src / vlib / node.h

diff --git a/src/vlib/node.h b/src/vlib/node.h
index 21a2022..75a0adb 100644 (file)
--- a/src/vlib/node.h
+++ b/src/vlib/node.h
@@ -115,7 +115,7 @@ typedef struct _vlib_node_registration
 
   /* Error strings indexed by error code for this node. */
   char **error_strings;
-  vl_counter_t *error_counters;
+  vlib_error_desc_t *error_counters;
 
   /* Buffer format/unformat for this node. */
   format_function_t *format_buffer;
@@ -216,7 +216,7 @@ static __clib_unused vlib_node_registration_t __clib_unused_##x
     r->next_registration = node.node_fn_registrations;                        \
     node.node_fn_registrations = r;                                           \
   }                                                                           \
-  uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (node##_fn)
+  uword CLIB_MARCH_SFX (node##_fn)
 
 unformat_function_t unformat_vlib_node_variant;
 
@@ -316,7 +316,7 @@ typedef struct vlib_node_t
   u32 error_heap_index;
 
   /* Counter structures indexed by counter code for this node. */
-  vl_counter_t *error_counters;
+  vlib_error_desc_t *error_counters;
 
   /* Vector of next node names.
      Only used before next_nodes array is initialized. */
@@ -439,12 +439,12 @@ vlib_next_frame_init (vlib_next_frame_t * nf)
 /* A frame pending dispatch by main loop. */
 typedef struct
 {
-  /* Node and runtime for this frame. */
-  u32 node_runtime_index;
-
   /* Frame index (in the heap). */
   vlib_frame_t *frame;
 
+  /* Node and runtime for this frame. */
+  u32 node_runtime_index;
+
   /* Start of next frames for this node. */
   u32 next_frame_index;
 
@@ -765,7 +765,6 @@ typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   u64 head;
-  u64 head_hint;
   u64 tail;
   u32 n_in_use;
   u32 nelts;