net: ipmr: drop an instance of CONFIG_IP_MROUTE_MULTIPLE_TABLES
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Sat, 21 Nov 2015 14:57:29 +0000 (15:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Nov 2015 20:06:39 +0000 (15:06 -0500)
Trivial replace of ifdef with IS_BUILTIN().

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipmr.c

index 694fecf..a006d96 100644 (file)
@@ -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;