diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-11-21 15:57:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-23 15:06:39 -0500 |
| commit | 29c3f19739421cf749991cb8c693093b4ac58ad1 (patch) | |
| tree | b007966e18c4f37a7a00713f2444938e2d9ff758 /net/ipv4/ipmr.c | |
| parent | fe9ef3ce395d06e4f17e5995ab8455b9627f3306 (diff) | |
| download | linux-29c3f19739421cf749991cb8c693093b4ac58ad1.tar.bz2 | |
net: ipmr: drop an instance of CONFIG_IP_MROUTE_MULTIPLE_TABLES
Trivial replace of ifdef with IS_BUILTIN().
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 694fecf7838e..a006d96d6cd9 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -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; |