leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ipmr: drop an instance of CONFIG_IP_MROUTE_MULTIPLE_TABLES

Browse Source 
Trivial replace of ifdef with IS_BUILTIN().

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2015-11-21 15:57:29 +01:00 committed by David S. Miller
parent fe9ef3ce39
commit 29c3f19739
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/ipmr.c
View File

@ -1396,11 +1396,12 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsi
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
} }
#ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES
case MRT_TABLE: case MRT_TABLE:
{ {
u32 v; u32 v;
if (!IS_BUILTIN(CONFIG_IP_MROUTE_MULTIPLE_TABLES))
return -ENOPROTOOPT;
if (optlen != sizeof(u32)) if (optlen != sizeof(u32))
return -EINVAL; return -EINVAL;
if (get_user(v, (u32 __user *)optval)) 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(); rtnl_unlock();
return ret; return ret;
} }
#endif
/* Spurious command, or MRT_VERSION which you cannot set. */ /* Spurious command, or MRT_VERSION which you cannot set. */
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;