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

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

Browse Source 
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>
This commit is contained in:
Nikolay Aleksandrov
2015-11-26 15:23:48 +01:00
committed by David S. Miller
parent 5ea1f13299
commit 1973a4ea6c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/pim.h
View File

@@ -13,6 +13,11 @@
#define PIM_NULL_REGISTER cpu_to_be32(0x40000000) #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 */ /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
struct pimreghdr struct pimreghdr
{ {

11
net/ipv4/ipmr.c
View File

@@ -75,11 +75,6 @@ struct ipmr_result {
struct mr_table *mrt; 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. /* Big lock, protecting vif table, mrt cache and mroute socket state.
* Note that the changes are semaphored via rtnl_lock. * 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) { switch (vifc->vifc_flags) {
case VIFF_REGISTER: case VIFF_REGISTER:
if (!pimsm_enabled()) if (!ipmr_pimsm_enabled())
return -EINVAL; return -EINVAL;
/* Special Purpose VIF in PIM /* Special Purpose VIF in PIM
* All the packets will be sent to the daemon * 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; mrt->mroute_do_assert = val;
break; break;
case MRT_PIM: case MRT_PIM:
if (!pimsm_enabled()) { if (!ipmr_pimsm_enabled()) {
ret = -ENOPROTOOPT; ret = -ENOPROTOOPT;
break; break;
} }
@@ -1451,7 +1446,7 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int
val = 0x0305; val = 0x0305;
break; break;
case MRT_PIM: case MRT_PIM:
if (!pimsm_enabled()) if (!ipmr_pimsm_enabled())
return -ENOPROTOOPT; return -ENOPROTOOPT;
val = mrt->mroute_do_pim; val = mrt->mroute_do_pim;
break; break;