A few headers contain instances of: #if defined(CONFIG_XXX) or defined(CONFIG_XXX_MODULE) Replace them with: #if IS_ENABLED(CONFIG_XXX)
Showing the changes to include/linux (2 of 4 files). Show all
Unified · Split
| @@ -422,7 +422,7 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) · 421 unmodified lines | ||
| 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; |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 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 |