Skip to content

Commit ac1f8c0

Browse files
committed
netfilter: nft_payload: move struct nft_payload_set definition where it belongs
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 <[email protected]>
1 parent d6dd508 commit ac1f8c0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

include/net/netfilter/nf_tables_core.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ struct nft_payload {
6666
u8 dreg;
6767
};
6868

69-
struct nft_payload_set {
70-
enum nft_payload_bases base:8;
71-
u8 offset;
72-
u8 len;
73-
u8 sreg;
74-
u8 csum_type;
75-
u8 csum_offset;
76-
u8 csum_flags;
77-
};
78-
7969
extern const struct nft_expr_ops nft_payload_fast_ops;
8070

8171
extern const struct nft_expr_ops nft_bitwise_fast_ops;

net/netfilter/nft_payload.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,16 @@ static int nft_payload_csum_inet(struct sk_buff *skb, const u32 *src,
665665
return 0;
666666
}
667667

668+
struct nft_payload_set {
669+
enum nft_payload_bases base:8;
670+
u8 offset;
671+
u8 len;
672+
u8 sreg;
673+
u8 csum_type;
674+
u8 csum_offset;
675+
u8 csum_flags;
676+
};
677+
668678
static void nft_payload_set_eval(const struct nft_expr *expr,
669679
struct nft_regs *regs,
670680
const struct nft_pktinfo *pkt)

0 commit comments

Comments
 (0)