summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/vlib/init.h20
-rw-r--r--src/vnet/feature/feature.c6
-rw-r--r--src/vnet/feature/feature.h2
-rw-r--r--src/vnet/feature/registration.c2
4 files changed, 16 insertions, 14 deletions
diff --git a/src/vlib/init.h b/src/vlib/init.h
index 1eddbb13d5a..f163ee2fb7a 100644
--- a/src/vlib/init.h
+++ b/src/vlib/init.h
@@ -81,20 +81,22 @@ typedef struct vlib_config_function_runtime_t
#define VLIB_REMOVE_FROM_LINKED_LIST(first,p,next) \
{ \
+ ASSERT (first); \
if (first == p) \
first = (p)->next; \
else \
{ \
__typeof__ (p) current = first; \
- while (current->next) \
- { \
- if (current->next == p) \
- { \
- current->next = current->next->next; \
- break; \
- } \
- current = current->next; \
- } \
+ while (current->next) \
+ { \
+ if (current->next == p) \
+ { \
+ current->next = current->next->next; \
+ break; \
+ } \
+ current = current->next; \
+ } \
+ ASSERT (current); \
} \
}
diff --git a/src/vnet/feature/feature.c b/src/vnet/feature/feature.c
index 89a1951663e..97100049b86 100644
--- a/src/vnet/feature/feature.c
+++ b/src/vnet/feature/feature.c
@@ -75,7 +75,7 @@ vnet_feature_init (vlib_main_t * vm)
arc_index = areg->feature_arc_index;
next = freg->next;
- freg->next = fm->next_feature_by_arc[arc_index];
+ freg->next_in_arc = fm->next_feature_by_arc[arc_index];
fm->next_feature_by_arc[arc_index] = freg;
/* next */
@@ -110,7 +110,7 @@ vnet_feature_init (vlib_main_t * vm)
{
hash_set_mem (fm->next_feature_by_name[arc_index],
freg->node_name, pointer_to_uword (freg));
- freg = freg->next;
+ freg = freg->next_in_arc;
}
/* next */
@@ -273,7 +273,7 @@ show_features_command_fn (vlib_main_t * vm,
while (freg)
{
vlib_cli_output (vm, " %s\n", freg->node_name);
- freg = freg->next;
+ freg = freg->next_in_arc;
}
diff --git a/src/vnet/feature/feature.h b/src/vnet/feature/feature.h
index 70a456ee7c1..f6b1d12b055 100644
--- a/src/vnet/feature/feature.h
+++ b/src/vnet/feature/feature.h
@@ -43,7 +43,7 @@ typedef clib_error_t *(vnet_feature_enable_disable_function_t)
typedef struct _vnet_feature_registration
{
/** next registration in list of all registrations*/
- struct _vnet_feature_registration *next;
+ struct _vnet_feature_registration *next, *next_in_arc;
/** Feature arc name */
char *arc_name;
/** Graph node name */
diff --git a/src/vnet/feature/registration.c b/src/vnet/feature/registration.c
index 872a19623bc..61024ca08cf 100644
--- a/src/vnet/feature/registration.c
+++ b/src/vnet/feature/registration.c
@@ -180,7 +180,7 @@ vnet_feature_arc_init (vlib_main_t * vm,
these_constraints++;
}
- this_reg = this_reg->next;
+ this_reg = this_reg->next_in_arc;
}
n_features = vec_len (node_names);