Skip to content

Commit

Permalink
netfilter: nf_tables: simplify lookup functions
Browse files Browse the repository at this point in the history
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: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Pablo Neira Ayuso committed Apr 24, 2018
1 parent df1e202 commit cac20fc
Show file tree
Hide file tree
Showing 4 changed files with 110 additions and 160 deletions.
12 changes: 6 additions & 6 deletions include/net/netfilter/nf_tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -1015,9 +1015,9 @@ 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,
const struct nlattr *nla, u32 objtype,
u8 genmask);
struct nft_object *nft_obj_lookup(const struct nft_table *table,
const struct nlattr *nla, u32 objtype,
u8 genmask);

void nft_obj_notify(struct net *net, struct nft_table *table,
struct nft_object *obj, u32 portid, u32 seq,
Expand Down Expand Up @@ -1106,9 +1106,9 @@ struct nft_flowtable {
struct nf_flowtable data;
};

struct nft_flowtable *nf_tables_flowtable_lookup(const struct nft_table *table,
const struct nlattr *nla,
u8 genmask);
struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table,
const struct nlattr *nla,
u8 genmask);

void nft_register_flowtable_type(struct nf_flowtable_type *type);
void nft_unregister_flowtable_type(struct nf_flowtable_type *type);
Expand Down
Loading

0 comments on commit cac20fc

Please sign in to comment.