diff options
author | Jeremy Sowden <jeremy@azazel.net> | 2019-09-13 09:13:11 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-09-13 12:47:09 +0200 |
commit | 25d7cbcd2bb5d919b9ba6fcdfe788e72c2df7e6e (patch) | |
tree | 3e8af8ab67f09c960c6259c42dc9c92e8054e1c7 /include/linux/netfilter.h | |
parent | netfilter: conntrack: use consistent style when defining inline functions (diff) | |
download | linux-dev-25d7cbcd2bb5d919b9ba6fcdfe788e72c2df7e6e.tar.xz linux-dev-25d7cbcd2bb5d919b9ba6fcdfe788e72c2df7e6e.zip |
netfilter: replace defined(CONFIG...) || defined(CONFIG...MODULE) with IS_ENABLED(CONFIG...).
A few headers contain instances of:
#if defined(CONFIG_XXX) or defined(CONFIG_XXX_MODULE)
Replace them with:
#if IS_ENABLED(CONFIG_XXX)
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netfilter.h')
-rw-r--r-- | include/linux/netfilter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 049aeb40fa35..754995d028e2 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -422,7 +422,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) } #endif /*CONFIG_NETFILTER*/ -#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#if IS_ENABLED(CONFIG_NF_CONNTRACK) #include <linux/netfilter/nf_conntrack_zones_common.h> extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu; |