net: ipmr: move pimsm_enabled to pim.h and rename

Move the inline pimsm_enabled() to pim.h and rename it to
ipmr_pimsm_enabled to show it's for the ipv4 ipmr code since pim.h is
used by IPv6 too.

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

diff --git a/include/linux/pim.h b/include/linux/pim.h
index 252bf6644c518d03f8eeaf8586e187275d6bcea8..e1d756f813487eed56cd86f974e8e5a08e2cb0a3 100644 (file)
--- a/include/linux/pim.h
+++ b/include/linux/pim.h
@@ -13,6 +13,11 @@
 
 #define PIM_NULL_REGISTER      cpu_to_be32(0x40000000)
 
+static inline bool ipmr_pimsm_enabled(void)
+{
+       return IS_BUILTIN(CONFIG_IP_PIMSM_V1) || IS_BUILTIN(CONFIG_IP_PIMSM_V2);
+}
+
 /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
 struct pimreghdr
 {

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index ff3dbbb9f11c1dba10fcafb70b9e43aafa97c2d6..322fdc6ac75b3fb354e5a3b48e663fa351e080dc 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -75,11 +75,6 @@ struct ipmr_result {
        struct mr_table         *mrt;
 };
 
-static inline bool pimsm_enabled(void)
-{
-       return IS_BUILTIN(CONFIG_IP_PIMSM_V1) || IS_BUILTIN(CONFIG_IP_PIMSM_V2);
-}
-
 /* Big lock, protecting vif table, mrt cache and mroute socket state.
  * Note that the changes are semaphored via rtnl_lock.
  */
@@ -751,7 +746,7 @@ static int vif_add(struct net *net, struct mr_table *mrt,
 
        switch (vifc->vifc_flags) {
        case VIFF_REGISTER:
-               if (!pimsm_enabled())
+               if (!ipmr_pimsm_enabled())
                        return -EINVAL;
                /* Special Purpose VIF in PIM
                 * All the packets will be sent to the daemon
@@ -1377,7 +1372,7 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,
                mrt->mroute_do_assert = val;
                break;
        case MRT_PIM:
-               if (!pimsm_enabled()) {
+               if (!ipmr_pimsm_enabled()) {
                        ret = -ENOPROTOOPT;
                        break;
                }
@@ -1451,7 +1446,7 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int
                val = 0x0305;
                break;
        case MRT_PIM:
-               if (!pimsm_enabled())
+               if (!ipmr_pimsm_enabled())
                        return -ENOPROTOOPT;
                val = mrt->mroute_do_pim;
                break;