netfilter: nf_tables: kill nft_data_cmp()

Only needlessly complicates things due to requiring specific argument
types. Use memcmp directly.

Signed-off-by: Patrick McHardy <kaber@trash.net>
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 81cd816554b96e826cd21aa5385a1ca6fcbe5ee9..fca0b5def6297f1048de229c5843ea54df1f7949 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -69,13 +69,6 @@ struct nft_regs {
        };
 };
 
-static inline int nft_data_cmp(const struct nft_data *d1,
-                              const struct nft_data *d2,
-                              unsigned int len)
-{
-       return memcmp(d1->data, d2->data, len);
-}
-
 static inline void nft_data_copy(struct nft_data *dst,
                                 const struct nft_data *src)
 {

diff --git a/net/netfilter/nft_cmp.c b/net/netfilter/nft_cmp.c
index 59391e6a92a5e15367693cdd3aaab24be9accdbc..b7e1c58864cfcbda9aeb84fa01cab1f913212d40 100644 (file)
--- a/net/netfilter/nft_cmp.c
+++ b/net/netfilter/nft_cmp.c
@@ -31,7 +31,7 @@ static void nft_cmp_eval(const struct nft_expr *expr,
        const struct nft_cmp_expr *priv = nft_expr_priv(expr);
        int d;
 
-       d = nft_data_cmp(&regs->data[priv->sreg], &priv->data, priv->len);
+       d = memcmp(&regs->data[priv->sreg], &priv->data, priv->len);
        switch (priv->op) {
        case NFT_CMP_EQ:
                if (d != 0)

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index b1101f71807f0793223f248f51099040f054bf6f..26ba4e192121c69ee255462c21aa02ffa445b29d 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -62,7 +62,7 @@ static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg,
        const struct nft_hash_cmp_arg *x = arg->key;
        const struct nft_hash_elem *he = ptr;
 
-       if (nft_data_cmp(nft_set_ext_key(&he->ext), x->key, x->set->klen))
+       if (memcmp(nft_set_ext_key(&he->ext), x->key, x->set->klen))
                return 1;
        if (nft_set_elem_expired(&he->ext))
                return 1;

diff --git a/net/netfilter/nft_rbtree.c b/net/netfilter/nft_rbtree.c
index 42d0ca45fb9e9e64daf3799aad420f205c5586e0..b398f1a856d5eee777e3d9cfae48938a00545342 100644 (file)
--- a/net/netfilter/nft_rbtree.c
+++ b/net/netfilter/nft_rbtree.c
@@ -45,7 +45,7 @@ static bool nft_rbtree_lookup(const struct nft_set *set,
        while (parent != NULL) {
                rbe = rb_entry(parent, struct nft_rbtree_elem, node);
 
-               d = nft_data_cmp(nft_set_ext_key(&rbe->ext), key, set->klen);
+               d = memcmp(nft_set_ext_key(&rbe->ext), key, set->klen);
                if (d < 0) {
                        parent = parent->rb_left;
                        interval = rbe;
@@ -91,9 +91,9 @@ static int __nft_rbtree_insert(const struct nft_set *set,
        while (*p != NULL) {
                parent = *p;
                rbe = rb_entry(parent, struct nft_rbtree_elem, node);
-               d = nft_data_cmp(nft_set_ext_key(&rbe->ext),
-                                nft_set_ext_key(&new->ext),
-                                set->klen);
+               d = memcmp(nft_set_ext_key(&rbe->ext),
+                          nft_set_ext_key(&new->ext),
+                          set->klen);
                if (d < 0)
                        p = &parent->rb_left;
                else if (d > 0)
@@ -153,8 +153,7 @@ static void *nft_rbtree_deactivate(const struct nft_set *set,
        while (parent != NULL) {
                rbe = rb_entry(parent, struct nft_rbtree_elem, node);
 
-               d = nft_data_cmp(nft_set_ext_key(&rbe->ext), &elem->key,
-                                set->klen);
+               d = memcmp(nft_set_ext_key(&rbe->ext), &elem->key, set->klen);
                if (d < 0)
                        parent = parent->rb_left;
                else if (d > 0)