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/br_netfilter.h | |
| parent | netfilter: conntrack: remove CONFIG_NF_CONNTRACK check from nf_conntrack_acct.h. (diff) | |
| download | linux-dev-f19438bdd4bfbfdaac441034c1aaecf02c116e68.tar.xz linux-dev-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/br_netfilter.h')
| -rw-r--r-- | include/net/netfilter/br_netfilter.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/netfilter/br_netfilter.h b/include/net/netfilter/br_netfilter.h index c53909fd22cd..371696ec11b2 100644 --- a/include/net/netfilter/br_netfilter.h +++ b/include/net/netfilter/br_netfilter.h @@ -55,7 +55,6 @@ static inline struct rtable *bridge_parent_rtable(const struct net_device *dev) struct net_device *setup_pre_routing(struct sk_buff *skb, const struct net *net); -#if IS_ENABLED(CONFIG_NETFILTER) #if IS_ENABLED(CONFIG_IPV6) int br_validate_ipv6(struct net *net, struct sk_buff *skb); unsigned int br_nf_pre_routing_ipv6(void *priv, @@ -74,6 +73,5 @@ br_nf_pre_routing_ipv6(void *priv, struct sk_buff *skb, return NF_ACCEPT; } #endif -#endif #endif /* _BR_NETFILTER_H_ */ |