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: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Родитель
1f48ff6c53
Коммит
55af753cd9
|
@ -244,11 +244,11 @@ enum nft_set_class {
|
|||
* characteristics
|
||||
*
|
||||
* @size: required memory
|
||||
* @class: lookup performance class
|
||||
* @lookup: lookup performance class
|
||||
*/
|
||||
struct nft_set_estimate {
|
||||
unsigned int size;
|
||||
enum nft_set_class class;
|
||||
enum nft_set_class lookup;
|
||||
};
|
||||
|
||||
struct nft_set_ext;
|
||||
|
|
|
@ -2403,7 +2403,7 @@ nft_select_set_ops(const struct nlattr * const nla[],
|
|||
|
||||
bops = NULL;
|
||||
best.size = ~0;
|
||||
best.class = ~0;
|
||||
best.lookup = ~0;
|
||||
|
||||
list_for_each_entry(ops, &nf_tables_set_ops, list) {
|
||||
if ((ops->features & features) != features)
|
||||
|
@ -2413,15 +2413,15 @@ nft_select_set_ops(const struct nlattr * const nla[],
|
|||
|
||||
switch (policy) {
|
||||
case NFT_SET_POL_PERFORMANCE:
|
||||
if (est.class < best.class)
|
||||
if (est.lookup < best.lookup)
|
||||
break;
|
||||
if (est.class == best.class && est.size < best.size)
|
||||
if (est.lookup == best.lookup && est.size < best.size)
|
||||
break;
|
||||
continue;
|
||||
case NFT_SET_POL_MEMORY:
|
||||
if (est.size < best.size)
|
||||
break;
|
||||
if (est.size == best.size && est.class < best.class)
|
||||
if (est.size == best.size && est.lookup < best.lookup)
|
||||
break;
|
||||
continue;
|
||||
default:
|
||||
|
|
|
@ -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->class = NFT_SET_CLASS_O_1;
|
||||
est->lookup = NFT_SET_CLASS_O_1;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -291,7 +291,7 @@ static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features,
|
|||
else
|
||||
est->size = nsize;
|
||||
|
||||
est->class = NFT_SET_CLASS_O_LOG_N;
|
||||
est->lookup = NFT_SET_CLASS_O_LOG_N;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче