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>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 5830f594842e80bffb676785b943fdf3fc0022bf..d76ac2f80a40b2244f4e44d214967b896f309902 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -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;

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 7ae810b034622cff2dc6bd9b1585f25428e28e1b..fa7cd16790791c40079e88bb9d9d6d939b378844 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2401,9 +2401,9 @@ nft_select_set_ops(const struct nlattr * const nla[],
                features &= NFT_SET_INTERVAL | NFT_SET_MAP | NFT_SET_TIMEOUT;
        }
 
-       bops       = NULL;
-       best.size  = ~0;
-       best.class = ~0;
+       bops        = NULL;
+       best.size   = ~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:

diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index 2f10ac3b1b1084a574f309f4ce2d6e2c55515d08..e58e7f02138bdefe00810626cf5cbf57b2838d3a 100644 (file)
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -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;
 }

diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
index 81b8a4c2c06193cd8c0462aa0d824f5bdc0da2df..2b6ea10c4bbd31db8ce0e10c1860150c997a50bf 100644 (file)
--- a/net/netfilter/nft_set_rbtree.c
+++ b/net/netfilter/nft_set_rbtree.c
@@ -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;
 }