Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cd8937a authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: convert sets to u32 data pointers 



Simple conversion to use u32 pointers to the beginning of the data
area to keep follow up patches smaller.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e562d860

include/net/netfilter/nf_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -231,10 +231,10 @@ struct nft_expr; 
 */

struct nft_set_ops {

	bool				(*lookup)(const struct nft_set *set,

						  const struct nft_data *key,

						  const u32 *key,

						  const struct nft_set_ext **ext);

	bool				(*update)(struct nft_set *set,

						  const struct nft_data *key,

						  const u32 *key,

						  void *(*new)(struct nft_set *,

							       const struct nft_expr *,

							       struct nft_regs *),

net/netfilter/nft_hash.c

+5 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct nft_hash_elem { 


struct nft_hash_cmp_arg {

	const struct nft_set		*set;

	const struct nft_data		*key;

	const u32			*key;

	u8				genmask;

};
@@ -71,8 +71,7 @@ static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg, 
	return 0;

}



static bool nft_hash_lookup(const struct nft_set *set,

			    const struct nft_data *key,

static bool nft_hash_lookup(const struct nft_set *set, const u32 *key,

			    const struct nft_set_ext **ext)

{

	struct nft_hash *priv = nft_set_priv(set);
@@ -90,7 +89,7 @@ static bool nft_hash_lookup(const struct nft_set *set, 
	return !!he;

}



static bool nft_hash_update(struct nft_set *set, const struct nft_data *key,

static bool nft_hash_update(struct nft_set *set, const u32 *key,

			    void *(*new)(struct nft_set *,

					 const struct nft_expr *,

					 struct nft_regs *regs),
@@ -134,7 +133,7 @@ static int nft_hash_insert(const struct nft_set *set, 
	struct nft_hash_cmp_arg arg = {

		.genmask = nft_genmask_next(read_pnet(&set->pnet)),

		.set	 = set,

		.key	 = &elem->key,

		.key	 = elem->key.data,

	};



	return rhashtable_lookup_insert_key(&priv->ht, &arg, &he->node,
@@ -158,7 +157,7 @@ static void *nft_hash_deactivate(const struct nft_set *set, 
	struct nft_hash_cmp_arg arg = {

		.genmask = nft_genmask_next(read_pnet(&set->pnet)),

		.set	 = set,

		.key	 = &elem->key,

		.key	 = elem->key.data,

	};



	rcu_read_lock();

net/netfilter/nft_rbtree.c

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ struct nft_rbtree_elem { 
};





static bool nft_rbtree_lookup(const struct nft_set *set,

			      const struct nft_data *key,

static bool nft_rbtree_lookup(const struct nft_set *set, const u32 *key,

			      const struct nft_set_ext **ext)

{

	const struct nft_rbtree *priv = nft_set_priv(set);