diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-30 15:26:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-30 15:26:23 -0500 |
| commit | 75c4a57ca9ee747f1cbb24591d92a41b2eddff52 (patch) | |
| tree | 19c36dd7093315894566255065147548cc2751fa /include/linux/pim.h | |
| parent | 43cd6991a04bd83c894dbbee53c6e60a343b6033 (diff) | |
| parent | ccbb0aa62da7f4b765b3e311caf25ea43cc3d0ad (diff) | |
| download | op-kernel-dev-75c4a57ca9ee747f1cbb24591d92a41b2eddff52.zip op-kernel-dev-75c4a57ca9ee747f1cbb24591d92a41b2eddff52.tar.gz | |
Merge branch 'ipmr-nl'
Nikolay Aleksandrov says:
====================
net: ipmr: more cleanups and mfc netlink support
This set continues with the minor cleanups in the first 6 patches and
patch 7 adds the first new feature - MFC manipulation via netlink. It
registers NEWROUTE/DELROUTE for that purpose and uses the same semantics
as the already present netlink dump. The only new attribute that is used
is RTA_PREFSRC to denote an MFC_PROXY entry. Currently the table must
exist before adding an entry, and new tables can be created only via
setsockopt, but that will be changed in the future.
This set was tested with modified iproute2 which supports NEWROUTE/DELROUTE
for RTNL_FAMILY_IPMR.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/pim.h')
| -rw-r--r-- | include/linux/pim.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pim.h b/include/linux/pim.h index 252bf66..e1d756f 100644 --- 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 { |
