pim6d: drop off MLAG code

diff --git a/pimd/pim_mlag.h b/pimd/pim_mlag.h
index 996e4d473f06dd5dd3a604b123c892653ceb78a0..0555c7d3ff38c6a55a35e053af95b51e7f0f7018 100644 (file)
--- a/pimd/pim_mlag.h
+++ b/pimd/pim_mlag.h
@@ -28,6 +28,7 @@
 #include "mlag.h"
 #include "pim_iface.h"
 
+#if PIM_IPV == 4
 extern void pim_mlag_init(void);
 extern void pim_mlag_terminate(void);
 extern void pim_instance_mlag_init(struct pim_instance *pim);
@@ -52,4 +53,49 @@ extern void pim_mlag_up_local_del(struct pim_instance *pim,
 extern bool pim_mlag_up_df_role_update(struct pim_instance *pim,
                                       struct pim_upstream *up, bool is_df,
                                       const char *reason);
+#else /* PIM_IPV == 4 */
+static inline void pim_mlag_terminate(void)
+{
+}
+
+static inline void pim_instance_mlag_init(struct pim_instance *pim)
+{
+}
+
+static inline void pim_instance_mlag_terminate(struct pim_instance *pim)
+{
+}
+
+static inline void pim_if_configure_mlag_dualactive(
+                                               struct pim_interface *pim_ifp)
+{
+}
+
+static inline void pim_if_unconfigure_mlag_dualactive(
+                                               struct pim_interface *pim_ifp)
+{
+}
+
+static inline void pim_mlag_register(void)
+{
+}
+
+static inline void pim_mlag_up_local_add(struct pim_instance *pim,
+                                        struct pim_upstream *upstream)
+{
+}
+
+static inline void pim_mlag_up_local_del(struct pim_instance *pim,
+                                        struct pim_upstream *upstream)
+{
+}
+
+static inline bool pim_mlag_up_df_role_update(struct pim_instance *pim,
+                                             struct pim_upstream *up,
+                                             bool is_df, const char *reason)
+{
+       return false;
+}
+#endif
+
 #endif

diff --git a/pimd/subdir.am b/pimd/subdir.am
index de5954085b6152740b71e0c95803942ed7177022..0afaf666e02cf254ec8a89479f1ee485cbfd0ec9 100644 (file)
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -29,7 +29,6 @@ pim_common = \
        pimd/pim_jp_agg.c \
        pimd/pim_macro.c \
        pimd/pim_memory.c \
-       pimd/pim_mlag.c \
        pimd/pim_mroute.c \
        pimd/pim_msg.c \
        pimd/pim_nb.c \
@@ -55,7 +54,6 @@ pim_common = \
        pimd/pim_zebra.c \
        pimd/pim_zlookup.c \
        pimd/pim_vxlan.c \
-       pimd/pim_zpthread.c \
        pimd/pimd.c \
        # end
 
@@ -67,10 +65,12 @@ pimd_pimd_SOURCES = \
        pimd/pim_igmpv2.c \
        pimd/pim_igmpv3.c \
        pimd/pim_main.c \
+       pimd/pim_mlag.c \
        pimd/pim_msdp.c \
        pimd/pim_msdp_packet.c \
        pimd/pim_msdp_socket.c \
        pimd/pim_signals.c \
+       pimd/pim_zpthread.c \
        # end
 
 nodist_pimd_pimd_SOURCES = \