diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2019-09-13 09:13:16 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-09-13 12:47:36 +0200 |
| commit | f19438bdd4bfbfdaac441034c1aaecf02c116e68 (patch) | |
| tree | 377d2cffea5eec5f2f5beefcd6c5fa8038502bf7 /include/net/netfilter/nf_conntrack_core.h | |
| parent | 51a21be42ad8c2a343eb0d44813e38918b6a4df7 (diff) | |
| download | linux-stable-f19438bdd4bfbfdaac441034c1aaecf02c116e68.tar.gz linux-stable-f19438bdd4bfbfdaac441034c1aaecf02c116e68.tar.bz2 linux-stable-f19438bdd4bfbfdaac441034c1aaecf02c116e68.zip | |
netfilter: remove CONFIG_NETFILTER checks from headers.
`struct nf_hook_ops`, `struct nf_hook_state` and the `nf_hookfn`
function typedef appear in function and struct declarations and
definitions in a number of netfilter headers. The structs and typedef
themselves are defined by linux/netfilter.h but only when
CONFIG_NETFILTER is enabled. Define them unconditionally and add
forward declarations in order to remove CONFIG_NETFILTER conditionals
from the other headers.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_conntrack_core.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index d340886e012d..09f2efea0b97 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h @@ -22,9 +22,8 @@ standalone connection tracking module, and the compatibility layer's use of connection tracking. */ -#if IS_ENABLED(CONFIG_NETFILTER) -unsigned int nf_conntrack_in(struct sk_buff *skb, const struct nf_hook_state *state); -#endif +unsigned int nf_conntrack_in(struct sk_buff *skb, + const struct nf_hook_state *state); int nf_conntrack_init_net(struct net *net); void nf_conntrack_cleanup_net(struct net *net); |