Commit c0cd1156 authored by Igor Maravić's avatar Igor Maravić Committed by David S. Miller
Browse files

net:netfilter: use IS_ENABLED 



Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)

Signed-off-by: default avatarIgor Maravić <igorm@etf.rs>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29c36262

net/netfilter/core.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int skb_make_writable(struct sk_buff *skb, unsigned int writable_len) 
}

EXPORT_SYMBOL(skb_make_writable);



#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

/* This does not belong here, but locally generated errors need it if connection

   tracking in use: without this, connection may not be in hash table, and hence

   manufactured ICMP or RST packets will not be associated with it. */

net/netfilter/ipset/ip_set_getport.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ ip_set_get_ip4_port(const struct sk_buff *skb, bool src, 
}

EXPORT_SYMBOL_GPL(ip_set_get_ip4_port);



#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)

#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)

bool

ip_set_get_ip6_port(const struct sk_buff *skb, bool src,

		    __be16 *port, u8 *proto)

net/netfilter/ipvs/ip_vs_xmit.c

+4 −4
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 * Avoid duplicate tuple in reply direction for NAT traffic

	 * to local address when connection is sync-ed

	 */

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	if (cp->flags & IP_VS_CONN_F_SYNC && local) {

		enum ip_conntrack_info ctinfo;

		struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
@@ -658,7 +658,7 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 * Avoid duplicate tuple in reply direction for NAT traffic

	 * to local address when connection is sync-ed

	 */

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	if (cp->flags & IP_VS_CONN_F_SYNC && local) {

		enum ip_conntrack_info ctinfo;

		struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
@@ -1173,7 +1173,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 * Avoid duplicate tuple in reply direction for NAT traffic

	 * to local address when connection is sync-ed

	 */

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	if (cp->flags & IP_VS_CONN_F_SYNC && local) {

		enum ip_conntrack_info ctinfo;

		struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);
@@ -1293,7 +1293,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	 * Avoid duplicate tuple in reply direction for NAT traffic

	 * to local address when connection is sync-ed

	 */

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK)

	if (cp->flags & IP_VS_CONN_F_SYNC && local) {

		enum ip_conntrack_info ctinfo;

		struct nf_conn *ct = ct = nf_ct_get(skb, &ctinfo);

net/netfilter/nf_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ static struct nf_ct_ext_type nf_ct_zone_extend __read_mostly = { 
};

#endif



#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)

#if IS_ENABLED(CONFIG_NF_CT_NETLINK)



#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/nfnetlink_conntrack.h>

net/netfilter/nf_conntrack_h323_main.c

+1 −2
Original line number Diff line number Diff line
@@ -743,8 +743,7 @@ static int callforward_do_filter(const union nf_inet_addr *src, 
		}

		break;

	}

#if defined(CONFIG_NF_CONNTRACK_IPV6) || \

    defined(CONFIG_NF_CONNTRACK_IPV6_MODULE)

#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)

	case AF_INET6: {

		struct flowi6 fl1, fl2;

		struct rt6_info *rt1, *rt2;