[PATCH net-next 6/9] net: ipmr: drop an instance of CONFIG_IP_MROUTE_MULTIPLE_TABLES

[Nikolay Aleksandrov]

From: Nikolay Aleksandrov <niko...@cumulusnetworks.com>

Trivial replace of ifdef with IS_BUILTIN().

Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com>
---
 net/ipv4/ipmr.c | 4 ++--
 1 file 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;
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html