tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso 25d7cbcd 16b26cde

+5 -5
+1 -1
include/linux/netfilter.h
··· 422 422 } 423 423 #endif /*CONFIG_NETFILTER*/ 424 424 425 - #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) 425 + #if IS_ENABLED(CONFIG_NF_CONNTRACK) 426 426 #include <linux/netfilter/nf_conntrack_zones_common.h> 427 427 428 428 extern void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) __rcu;
+1 -1
include/linux/netfilter/ipset/ip_set_getport.h
··· 9 9 extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src, 10 10 __be16 *port, u8 *proto); 11 11 12 - #if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) 12 + #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) 13 13 extern bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src, 14 14 __be16 *port, u8 *proto); 15 15 #else
+1 -1
include/net/netfilter/nf_conntrack_extend.h
··· 8 8 9 9 enum nf_ct_ext_id { 10 10 NF_CT_EXT_HELPER, 11 - #if defined(CONFIG_NF_NAT) || defined(CONFIG_NF_NAT_MODULE) 11 + #if IS_ENABLED(CONFIG_NF_NAT) 12 12 NF_CT_EXT_NAT, 13 13 #endif 14 14 NF_CT_EXT_SEQADJ,
+2 -2
include/net/netfilter/nf_nat.h
··· 22 22 /* per conntrack: nat application helper private data */ 23 23 union nf_conntrack_nat_help { 24 24 /* insert nat helper private data here */ 25 - #if defined(CONFIG_NF_NAT_PPTP) || defined(CONFIG_NF_NAT_PPTP_MODULE) 25 + #if IS_ENABLED(CONFIG_NF_NAT_PPTP) 26 26 struct nf_nat_pptp nat_pptp_info; 27 27 #endif 28 28 }; ··· 47 47 48 48 static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct) 49 49 { 50 - #if defined(CONFIG_NF_NAT) || defined(CONFIG_NF_NAT_MODULE) 50 + #if IS_ENABLED(CONFIG_NF_NAT) 51 51 return nf_ct_ext_find(ct, NF_CT_EXT_NAT); 52 52 #else 53 53 return NULL;