diff options
| author | David S. Miller | 2012-06-23 17:10:10 -0700 |
|---|---|---|
| committer | David S. Miller | 2012-06-23 17:10:10 -0700 |
| commit | 0b4a9e1a591ca92726d32dbe043eb737734c6a0e (patch) | |
| tree | 8ee8e13183bc1852073e9a592780f069d73954f5 /include | |
| parent | dfbce08c19cba2ba4faaf8c0dd6d7678f46c78dd (diff) | |
| parent | 8e36c4b5b673edc6081599b8bd461e062e4910f4 (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo says:
====================
The following four patches provide Netfilter fixes for the cthelper
infrastructure that was recently merged mainstream, they are:
* two fixes for compilation breakage with two different configurations:
- CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
- NF_CONNTRACK_EVENTS=n and CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
* two fixes for sparse warnings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 dca19e61b30a..c613cf0d7884 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -401,10 +401,14 @@ struct nfq_ct_hook { size_t (*build_size)(const struct nf_conn *ct); int (*build)(struct sk_buff *skb, struct nf_conn *ct); int (*parse)(const struct nlattr *attr, struct nf_conn *ct); +}; +extern struct nfq_ct_hook __rcu *nfq_ct_hook; + +struct nfq_ct_nat_hook { void (*seq_adjust)(struct sk_buff *skb, struct nf_conn *ct, u32 ctinfo, int off); }; -extern struct nfq_ct_hook *nfq_ct_hook; +extern struct nfq_ct_nat_hook __rcu *nfq_ct_nat_hook; #else static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {} #endif |