Commit 55af753c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: nf_tables: rename struct nft_set_estimate class field

Use lookup as field name instead, to prepare the introduction of the
memory class in a follow up patch.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1f48ff6c
...@@ -244,11 +244,11 @@ enum nft_set_class { ...@@ -244,11 +244,11 @@ enum nft_set_class {
* characteristics * characteristics
* *
* @size: required memory * @size: required memory
* @class: lookup performance class * @lookup: lookup performance class
*/ */
struct nft_set_estimate { struct nft_set_estimate {
unsigned int size; unsigned int size;
enum nft_set_class class; enum nft_set_class lookup;
}; };
struct nft_set_ext; struct nft_set_ext;
......
...@@ -2401,9 +2401,9 @@ nft_select_set_ops(const struct nlattr * const nla[], ...@@ -2401,9 +2401,9 @@ nft_select_set_ops(const struct nlattr * const nla[],
features &= NFT_SET_INTERVAL | NFT_SET_MAP | NFT_SET_TIMEOUT; features &= NFT_SET_INTERVAL | NFT_SET_MAP | NFT_SET_TIMEOUT;
} }
bops = NULL; bops = NULL;
best.size = ~0; best.size = ~0;
best.class = ~0; best.lookup = ~0;
list_for_each_entry(ops, &nf_tables_set_ops, list) { list_for_each_entry(ops, &nf_tables_set_ops, list) {
if ((ops->features & features) != features) if ((ops->features & features) != features)
...@@ -2413,15 +2413,15 @@ nft_select_set_ops(const struct nlattr * const nla[], ...@@ -2413,15 +2413,15 @@ nft_select_set_ops(const struct nlattr * const nla[],
switch (policy) { switch (policy) {
case NFT_SET_POL_PERFORMANCE: case NFT_SET_POL_PERFORMANCE:
if (est.class < best.class) if (est.lookup < best.lookup)
break; break;
if (est.class == best.class && est.size < best.size) if (est.lookup == best.lookup && est.size < best.size)
break; break;
continue; continue;
case NFT_SET_POL_MEMORY: case NFT_SET_POL_MEMORY:
if (est.size < best.size) if (est.size < best.size)
break; break;
if (est.size == best.size && est.class < best.class) if (est.size == best.size && est.lookup < best.lookup)
break; break;
continue; continue;
default: default:
......
...@@ -384,7 +384,7 @@ static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features, ...@@ -384,7 +384,7 @@ static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features,
est->size = esize + 2 * sizeof(struct nft_hash_elem *); est->size = esize + 2 * sizeof(struct nft_hash_elem *);
} }
est->class = NFT_SET_CLASS_O_1; est->lookup = NFT_SET_CLASS_O_1;
return true; return true;
} }
......
...@@ -291,7 +291,7 @@ static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features, ...@@ -291,7 +291,7 @@ static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
else else
est->size = nsize; est->size = nsize;
est->class = NFT_SET_CLASS_O_LOG_N; est->lookup = NFT_SET_CLASS_O_LOG_N;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment