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

Commit cac20fcd authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: simplify lookup functions 



Replace the nf_tables_ prefix by nft_ and merge code into single lookup
function whenever possible. In many cases we go over the 80-chars
boundary function names, this save us ~50 LoC.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent df1e2025

include/net/netfilter/nf_tables.h

+6 −6
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static inline void *nft_obj_data(const struct nft_object *obj) 


#define nft_expr_obj(expr)	*((struct nft_object **)nft_expr_priv(expr))



struct nft_object *nf_tables_obj_lookup(const struct nft_table *table,

struct nft_object *nft_obj_lookup(const struct nft_table *table,

				  const struct nlattr *nla, u32 objtype,

				  u8 genmask);
@@ -1106,7 +1106,7 @@ struct nft_flowtable { 
	struct nf_flowtable		data;

};



struct nft_flowtable *nf_tables_flowtable_lookup(const struct nft_table *table,

struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table,

					   const struct nlattr *nla,

					   u8 genmask);

net/netfilter/nf_tables_api.c

+100 −149

File changed.

Preview size limit exceeded, changes collapsed.

net/netfilter/nft_flow_offload.c

+2 −3
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ static int nft_flow_offload_init(const struct nft_ctx *ctx, 
	if (!tb[NFTA_FLOW_TABLE_NAME])

		return -EINVAL;



	flowtable = nf_tables_flowtable_lookup(ctx->table,

					       tb[NFTA_FLOW_TABLE_NAME],

	flowtable = nft_flowtable_lookup(ctx->table, tb[NFTA_FLOW_TABLE_NAME],

					 genmask);

	if (IS_ERR(flowtable))

		return PTR_ERR(flowtable);

net/netfilter/nft_objref.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int nft_objref_init(const struct nft_ctx *ctx, 
		return -EINVAL;



	objtype = ntohl(nla_get_be32(tb[NFTA_OBJREF_IMM_TYPE]));

	obj = nf_tables_obj_lookup(ctx->table, tb[NFTA_OBJREF_IMM_NAME], objtype,

	obj = nft_obj_lookup(ctx->table, tb[NFTA_OBJREF_IMM_NAME], objtype,

			     genmask);

	if (IS_ERR(obj))

		return -ENOENT;