Commit 29c3f197 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: ipmr: drop an instance of CONFIG_IP_MROUTE_MULTIPLE_TABLES 



Trivial replace of ifdef with IS_BUILTIN().

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe9ef3ce

net/ipv4/ipmr.c

+2 −2
Original line number Diff line number Diff line
@@ -1396,11 +1396,12 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi 
		rtnl_unlock();

		return ret;

	}

#ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES

	case MRT_TABLE:

	{

		u32 v;



		if (!IS_BUILTIN(CONFIG_IP_MROUTE_MULTIPLE_TABLES))

			return -ENOPROTOOPT;

		if (optlen != sizeof(u32))

			return -EINVAL;

		if (get_user(v, (u32 __user *)optval))
@@ -1420,7 +1421,6 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi 
		rtnl_unlock();

		return ret;

	}

#endif

	/* Spurious command, or MRT_VERSION which you cannot set. */

	default:

		return -ENOPROTOOPT;