Commit 40e4783e authored by Igor Maravic's avatar Igor Maravic Committed by David S. Miller
Browse files

ipv4: arp: Cleanup in arp.c 



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

Signed-off-by: default avatarIgor Maravic <igorm@etf.rs>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a5912db

net/ipv4/arp.c

+10 −10
Original line number Diff line number Diff line
@@ -277,9 +277,9 @@ static int arp_constructor(struct neighbour *neigh) 
		default:

			break;

		case ARPHRD_ROSE:

#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if IS_ENABLED(CONFIG_AX25)

		case ARPHRD_AX25:

#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)

#if IS_ENABLED(CONFIG_NETROM)

		case ARPHRD_NETROM:

#endif

			neigh->ops = &arp_broken_ops;
@@ -629,13 +629,13 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
		arp->ar_pro = htons(ETH_P_IP);

		break;



#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if IS_ENABLED(CONFIG_AX25)

	case ARPHRD_AX25:

		arp->ar_hrd = htons(ARPHRD_AX25);

		arp->ar_pro = htons(AX25_P_IP);

		break;



#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)

#if IS_ENABLED(CONFIG_NETROM)

	case ARPHRD_NETROM:

		arp->ar_hrd = htons(ARPHRD_NETROM);

		arp->ar_pro = htons(AX25_P_IP);
@@ -643,13 +643,13 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
#endif

#endif



#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE)

#if IS_ENABLED(CONFIG_FDDI)

	case ARPHRD_FDDI:

		arp->ar_hrd = htons(ARPHRD_ETHER);

		arp->ar_pro = htons(ETH_P_IP);

		break;

#endif

#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)

#if IS_ENABLED(CONFIG_TR)

	case ARPHRD_IEEE802_TR:

		arp->ar_hrd = htons(ARPHRD_IEEE802);

		arp->ar_pro = htons(ETH_P_IP);
@@ -1036,7 +1036,7 @@ static int arp_req_set(struct net *net, struct arpreq *r, 
			return -EINVAL;

	}

	switch (dev->type) {

#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE)

#if IS_ENABLED(CONFIG_FDDI)

	case ARPHRD_FDDI:

		/*

		 * According to RFC 1390, FDDI devices should accept ARP
@@ -1282,7 +1282,7 @@ void __init arp_init(void) 
}



#ifdef CONFIG_PROC_FS

#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if IS_ENABLED(CONFIG_AX25)



/* ------------------------------------------------------------------------ */

/*
@@ -1330,7 +1330,7 @@ static void arp_format_neigh_entry(struct seq_file *seq, 


	read_lock(&n->lock);

	/* Convert hardware address to XX:XX:XX:XX ... form. */

#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if IS_ENABLED(CONFIG_AX25)

	if (hatype == ARPHRD_AX25 || hatype == ARPHRD_NETROM)

		ax2asc2((ax25_address *)n->ha, hbuffer);

	else {
@@ -1343,7 +1343,7 @@ static void arp_format_neigh_entry(struct seq_file *seq, 
	if (k != 0)

		--k;

	hbuffer[k] = 0;

#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#if IS_ENABLED(CONFIG_AX25)

	}

#endif

	sprintf(tbuf, "%pI4", n->primary_key);