projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif-rid: Fix names of recirc_metadata_{hash,equal}().
[cascardo/ovs.git]
/
ofproto
/
ofproto-dpif-rid.c
diff --git
a/ofproto/ofproto-dpif-rid.c
b/ofproto/ofproto-dpif-rid.c
index
8aee68f
..
eb80410
100644
(file)
--- 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
}
static uint32_t
-recirc_
metadata
_hash(const struct recirc_state *state)
+recirc_
state
_hash(const struct recirc_state *state)
{
uint32_t hash;
{
uint32_t hash;
@@
-160,7
+160,7
@@
recirc_metadata_hash(const struct recirc_state *state)
}
static bool
}
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
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) {
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;
}
}
return node;
}
}
@@
-277,7
+277,7
@@
recirc_alloc_id__(const struct recirc_state *state, uint32_t hash)
uint32_t
recirc_find_id(const struct recirc_state *target)
{
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;
}
struct recirc_id_node *node = recirc_find_equal(target, hash);
return node ? node->id : 0;
}
@@
-287,7
+287,7
@@
recirc_find_id(const struct recirc_state *target)
uint32_t
recirc_alloc_id_ctx(const struct recirc_state *state)
{
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);
struct recirc_id_node *node = recirc_ref_equal(state, hash);
if (!node) {
node = recirc_alloc_id__(state, hash);
@@
-307,7
+307,7
@@
recirc_alloc_id(struct ofproto_dpif *ofproto)
.ofproto = ofproto,
.metadata = { .tunnel = &tunnel, .in_port = OFPP_NONE },
};
.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
}
static void