netfilter: nft_payload: move struct nft_payload_set definition where it belongs

[ Upstream commit ac1f8c049319847b1b4c6b387fdb2e3f7fb84ffc ]

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>
Stable-dep-of: 33c563ebf8d3 ("netfilter: nft_payload: skbuff vlan metadata mangle support")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h
index 9dfa11d4224d2f36c8220ba475c47a18de58fedd..315869fc3fcb8f0361a40957af99d76309dbdc70 100644 (file)
--- a/include/net/netfilter/nf_tables_core.h
+++ b/include/net/netfilter/nf_tables_core.h
@@ -74,16 +74,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 4192f0e3665542b3cf514bae54d8a89677d0b4bb..e5f0d33a27e61afc0d80920d291d002999d08d9f 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -629,6 +629,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)