| Message ID | 20221026132227.3287-2-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [net-next,01/10] netfilter: nft_payload: move struct nft_payload_set definition where it belongs | expand |
Hello: This series was applied to netdev/net-next.git (master) by Pablo Neira Ayuso <pablo@netfilter.org>: On Wed, 26 Oct 2022 15:22:18 +0200 you wrote: > Not required to expose this header in nf_tables_core.h, move it to where > it is used, ie. nft_payload. > > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> > --- > include/net/netfilter/nf_tables_core.h | 10 ---------- > net/netfilter/nft_payload.c | 10 ++++++++++ > 2 files changed, 10 insertions(+), 10 deletions(-) Here is the summary with links: - [net-next,01/10] netfilter: nft_payload: move struct nft_payload_set definition where it belongs https://git.kernel.org/netdev/net-next/c/ac1f8c049319 - [net-next,02/10] netfilter: nf_tables: reduce nft_pktinfo by 8 bytes https://git.kernel.org/netdev/net-next/c/e7a1caa67ce6 - [net-next,03/10] netfilter: nft_objref: make it builtin https://git.kernel.org/netdev/net-next/c/d037abc2414b - [net-next,04/10] netfilter: nft_payload: access GRE payload via inner offset https://git.kernel.org/netdev/net-next/c/c247897d7c19 - [net-next,05/10] netfilter: nft_payload: access ipip payload for inner offset https://git.kernel.org/netdev/net-next/c/3927ce8850ca - [net-next,06/10] netfilter: nft_inner: support for inner tunnel header matching https://git.kernel.org/netdev/net-next/c/3a07327d10a0 - [net-next,07/10] netfilter: nft_inner: add percpu inner context https://git.kernel.org/netdev/net-next/c/0e795b37ba04 - [net-next,08/10] netfilter: nft_meta: add inner match support https://git.kernel.org/netdev/net-next/c/a150d122b6bd - [net-next,09/10] netfilter: nft_inner: add geneve support https://git.kernel.org/netdev/net-next/c/0db14b95660b - [net-next,10/10] netfilter: nft_inner: set tunnel offset to GRE header offset https://git.kernel.org/netdev/net-next/c/91619eb60aec You are awesome, thank you!
diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h index 1223af68cd9a..990c3767a350 100644 --- a/include/net/netfilter/nf_tables_core.h +++ b/include/net/netfilter/nf_tables_core.h @@ -66,16 +66,6 @@ struct nft_payload { u8 dreg; }; -struct nft_payload_set { - enum nft_payload_bases base:8; - u8 offset; - u8 len; - u8 sreg; - u8 csum_type; - u8 csum_offset; - u8 csum_flags; -}; - extern const struct nft_expr_ops nft_payload_fast_ops; extern const struct nft_expr_ops nft_bitwise_fast_ops; diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index 088244f9d838..07621d509a68 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -665,6 +665,16 @@ static int nft_payload_csum_inet(struct sk_buff *skb, const u32 *src, return 0; } +struct nft_payload_set { + enum nft_payload_bases base:8; + u8 offset; + u8 len; + u8 sreg; + u8 csum_type; + u8 csum_offset; + u8 csum_flags; +}; + static void nft_payload_set_eval(const struct nft_expr *expr, struct nft_regs *regs, const struct nft_pktinfo *pkt)
Not required to expose this header in nf_tables_core.h, move it to where it is used, ie. nft_payload. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- include/net/netfilter/nf_tables_core.h | 10 ---------- net/netfilter/nft_payload.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-)