Skip to content

Commit

Permalink
netfilter: nft_meta: extend reduce support to bridge family
Browse files Browse the repository at this point in the history
its enough to export the meta get reduce helper and then call it
from nft_meta_bridge too.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Florian Westphal authored and ummakynes committed Mar 19, 2022
1 parent e50ae44 commit aaa7b20
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions include/net/netfilter/nft_meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@ int nft_meta_set_validate(const struct nft_ctx *ctx,
const struct nft_expr *expr,
const struct nft_data **data);

bool nft_meta_get_reduce(struct nft_regs_track *track,
const struct nft_expr *expr);
#endif
1 change: 1 addition & 0 deletions net/bridge/netfilter/nft_meta_bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static const struct nft_expr_ops nft_meta_bridge_get_ops = {
.eval = nft_meta_bridge_get_eval,
.init = nft_meta_bridge_get_init,
.dump = nft_meta_get_dump,
.reduce = nft_meta_get_reduce,
};

static bool nft_meta_bridge_set_reduce(struct nft_regs_track *track,
Expand Down
5 changes: 3 additions & 2 deletions net/netfilter/nft_meta.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,8 +752,8 @@ static int nft_meta_get_offload(struct nft_offload_ctx *ctx,
return 0;
}

static bool nft_meta_get_reduce(struct nft_regs_track *track,
const struct nft_expr *expr)
bool nft_meta_get_reduce(struct nft_regs_track *track,
const struct nft_expr *expr)
{
const struct nft_meta *priv = nft_expr_priv(expr);
const struct nft_meta *meta;
Expand All @@ -775,6 +775,7 @@ static bool nft_meta_get_reduce(struct nft_regs_track *track,

return nft_expr_reduce_bitwise(track, expr);
}
EXPORT_SYMBOL_GPL(nft_meta_get_reduce);

static const struct nft_expr_ops nft_meta_get_ops = {
.type = &nft_meta_type,
Expand Down

0 comments on commit aaa7b20

Please sign in to comment.