diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-20 14:52:31 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-06-21 20:49:52 -0400 |
commit | d584a61a931e6cbfef0dd811c4ae0250ec5987f4 (patch) | |
tree | af8f5ff1ace6bc0034f5f351bca12d09e9c5f42e /include | |
parent | 5a05fae5ca7cd5279567747fc34d60413b504cd6 (diff) |
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
LD init/built-in.o
net/built-in.o:(.data+0x4408): undefined reference to `nf_nat_tcp_seq_adjust'
make: *** [vmlinux] Error 1
This patch adds a new pointer hook (nfq_ct_nat_hook) similar to other existing
in Netfilter to solve our complicated configuration dependencies.
Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netfilter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 38b96a54f9a5..c613cf0d7884 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h | |||
@@ -401,10 +401,14 @@ struct nfq_ct_hook { | |||
401 | size_t (*build_size)(const struct nf_conn *ct); | 401 | size_t (*build_size)(const struct nf_conn *ct); |
402 | int (*build)(struct sk_buff *skb, struct nf_conn *ct); | 402 | int (*build)(struct sk_buff *skb, struct nf_conn *ct); |
403 | int (*parse)(const struct nlattr *attr, struct nf_conn *ct); | 403 | int (*parse)(const struct nlattr *attr, struct nf_conn *ct); |
404 | }; | ||
405 | extern struct nfq_ct_hook __rcu *nfq_ct_hook; | ||
406 | |||
407 | struct nfq_ct_nat_hook { | ||
404 | void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct, | 408 | void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct, |
405 | u32 ctinfo, int off); | 409 | u32 ctinfo, int off); |
406 | }; | 410 | }; |
407 | extern struct nfq_ct_hook __rcu *nfq_ct_hook; | 411 | extern struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook; |
408 | #else | 412 | #else |
409 | static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} | 413 | static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} |
410 | #endif | 414 | #endif |