Acked-by: Jarno Rajahalme <ja...@ovn.org> > On Jan 18, 2016, at 11:27 PM, Ben Pfaff <b...@ovn.org> wrote: > > These functions actually hash or compare recirc_state structs, so they > should be named that way; recirc_metadata is only a small subset of > recirc_state. > > Signed-off-by: Ben Pfaff <b...@ovn.org> > --- > ofproto/ofproto-dpif-rid.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/ofproto/ofproto-dpif-rid.c b/ofproto/ofproto-dpif-rid.c > index f2d3c96..eab5baa 100644 > --- a/ofproto/ofproto-dpif-rid.c > +++ b/ofproto/ofproto-dpif-rid.c > @@ -126,7 +126,7 @@ recirc_id_node_find(uint32_t id) > } > > static uint32_t > -recirc_metadata_hash(const struct recirc_state *state) > +recirc_state_hash(const struct recirc_state *state) > { > uint32_t hash; > > @@ -160,7 +160,7 @@ recirc_metadata_hash(const struct recirc_state *state) > } > > static bool > -recirc_metadata_equal(const struct recirc_state *a, > +recirc_state_equal(const struct recirc_state *a, > const struct recirc_state *b) > { > return (a->table_id == b->table_id > @@ -186,7 +186,7 @@ recirc_find_equal(const struct recirc_state *target, > uint32_t hash) > struct recirc_id_node *node; > > CMAP_FOR_EACH_WITH_HASH (node, metadata_node, hash, &metadata_map) { > - if (recirc_metadata_equal(&node->state, target)) { > + if (recirc_state_equal(&node->state, target)) { > return node; > } > } > @@ -283,7 +283,7 @@ recirc_alloc_id__(const struct recirc_state *state, > uint32_t hash) > uint32_t > recirc_find_id(const struct recirc_state *target) > { > - uint32_t hash = recirc_metadata_hash(target); > + uint32_t hash = recirc_state_hash(target); > struct recirc_id_node *node = recirc_find_equal(target, hash); > return node ? node->id : 0; > } > @@ -293,7 +293,7 @@ recirc_find_id(const struct recirc_state *target) > uint32_t > recirc_alloc_id_ctx(const struct recirc_state *state) > { > - uint32_t hash = recirc_metadata_hash(state); > + uint32_t hash = recirc_state_hash(state); > struct recirc_id_node *node = recirc_ref_equal(state, hash); > if (!node) { > node = recirc_alloc_id__(state, hash); > @@ -313,7 +313,7 @@ recirc_alloc_id(struct ofproto_dpif *ofproto) > .ofproto = ofproto, > .metadata = { .tunnel = &tunnel, .in_port = OFPP_NONE }, > }; > - return recirc_alloc_id__(&state, recirc_metadata_hash(&state))->id; > + return recirc_alloc_id__(&state, recirc_state_hash(&state))->id; > } > > static void > -- > 2.1.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
_______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev