Commit aaa7b20b authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_meta: extend reduce support to bridge family 



its enough to export the meta get reduce helper and then call it
from nft_meta_bridge too.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e50ae445

include/net/netfilter/nft_meta.h

+2 −0
Original line number Diff line number Diff line
@@ -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

net/bridge/netfilter/nft_meta_bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

net/netfilter/nft_meta.c

+3 −2
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int nft_meta_get_offload(struct nft_offload_ctx *ctx, 
	return 0;

}



static bool nft_meta_get_reduce(struct nft_regs_track *track,

bool nft_meta_get_reduce(struct nft_regs_track *track,

			 const struct nft_expr *expr)

{

	const struct nft_meta *priv = nft_expr_priv(expr);
@@ -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,