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

Commit 10659cba authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables: rename to nft_set_lookup_global() 



To prepare shorter introduction of shorter function prefix.

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

include/net/netfilter/nf_tables.h

+5 −5
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static inline struct nft_set *nft_set_container_of(const void *priv) 
	return (void *)priv - offsetof(struct nft_set, data);

}



struct nft_set *nft_set_lookup(const struct net *net,

struct nft_set *nft_set_lookup_global(const struct net *net,

				      const struct nft_table *table,

				      const struct nlattr *nla_set_name,

				      const struct nlattr *nla_set_id,

net/netfilter/nf_tables_api.c

+6 −6
Original line number Diff line number Diff line
@@ -2633,7 +2633,7 @@ static struct nft_set *nf_tables_set_lookup_byid(const struct net *net, 
	return ERR_PTR(-ENOENT);

}



struct nft_set *nft_set_lookup(const struct net *net,

struct nft_set *nft_set_lookup_global(const struct net *net,

				      const struct nft_table *table,

				      const struct nlattr *nla_set_name,

				      const struct nlattr *nla_set_id,
@@ -2650,7 +2650,7 @@ struct nft_set *nft_set_lookup(const struct net *net, 
	}

	return set;

}

EXPORT_SYMBOL_GPL(nft_set_lookup);

EXPORT_SYMBOL_GPL(nft_set_lookup_global);



static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set,

				    const char *name)

net/netfilter/nft_dynset.c

+3 −2
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ static int nft_dynset_init(const struct nft_ctx *ctx, 
			priv->invert = true;

	}



	set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_DYNSET_SET_NAME],

	set = nft_set_lookup_global(ctx->net, ctx->table,

				    tb[NFTA_DYNSET_SET_NAME],

				    tb[NFTA_DYNSET_SET_ID], genmask);

	if (IS_ERR(set))

		return PTR_ERR(set);

net/netfilter/nft_lookup.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int nft_lookup_init(const struct nft_ctx *ctx, 
	    tb[NFTA_LOOKUP_SREG] == NULL)

		return -EINVAL;



	set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET],

	set = nft_set_lookup_global(ctx->net, ctx->table, tb[NFTA_LOOKUP_SET],

				    tb[NFTA_LOOKUP_SET_ID], genmask);

	if (IS_ERR(set))

		return PTR_ERR(set);

net/netfilter/nft_objref.c

+3 −2
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static int nft_objref_map_init(const struct nft_ctx *ctx, 
	struct nft_set *set;

	int err;



	set = nft_set_lookup(ctx->net, ctx->table, tb[NFTA_OBJREF_SET_NAME],

	set = nft_set_lookup_global(ctx->net, ctx->table,

				    tb[NFTA_OBJREF_SET_NAME],

				    tb[NFTA_OBJREF_SET_ID], genmask);

	if (IS_ERR(set))

		return PTR_ERR(set);