Message ID | 20250111230800.67349-2-pablo@netfilter.org (mailing list archive) |
---|---|
State | Accepted |
Commit | da0a090a3c6220772801b791845e408ae7579914 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next,1/4] netfilter: nf_tables: remove the genmask parameter | expand |
Hello: This series was applied to netdev/net-next.git (main) by Pablo Neira Ayuso <pablo@netfilter.org>: On Sun, 12 Jan 2025 00:07:57 +0100 you wrote: > From: tuqiang <tu.qiang35@zte.com.cn> > > The genmask parameter is not used within the nf_tables_addchain function > body. It should be removed to simplify the function parameter list. > > Signed-off-by: tuqiang <tu.qiang35@zte.com.cn> > Signed-off-by: Jiang Kun <jiang.kun2@zte.com.cn> > Reviewed-by: Simon Horman <horms@kernel.org> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > > [...] Here is the summary with links: - [net-next,1/4] netfilter: nf_tables: remove the genmask parameter https://git.kernel.org/netdev/net-next/c/da0a090a3c62 - [net-next,2/4] ipvs: speed up reads from ip_vs_conn proc file https://git.kernel.org/netdev/net-next/c/178883fd039d - [net-next,3/4] netfilter: xt_hashlimit: htable_selective_cleanup() optimization https://git.kernel.org/netdev/net-next/c/95f1c1e98db3 - [net-next,4/4] netfilter: conntrack: add conntrack event timestamp https://git.kernel.org/netdev/net-next/c/601731fc7c61 You are awesome, thank you!
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 0b9f1e8dfe49..f7ca7165e66e 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -2598,9 +2598,8 @@ int nft_chain_add(struct nft_table *table, struct nft_chain *chain) static u64 chain_id; -static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, - u8 policy, u32 flags, - struct netlink_ext_ack *extack) +static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 policy, + u32 flags, struct netlink_ext_ack *extack) { const struct nlattr * const *nla = ctx->nla; struct nft_table *table = ctx->table; @@ -3038,7 +3037,7 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info, extack); } - return nf_tables_addchain(&ctx, family, genmask, policy, flags, extack); + return nf_tables_addchain(&ctx, family, policy, flags, extack); } static int nft_delchain_hook(struct nft_ctx *ctx,