Merge branch 'master' into PIM_VRF

[mirror_frr.git] / zebra / rt_socket.c

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index 0eae3c4f25d07eee9495ee1f8499c8221982017c..4e4d726b4618042ad7878bc0f073a7d40582bc39 100644 (file)
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -409,7 +409,7 @@ int kernel_neigh_update(int add, int ifindex, uint32_t addr, char *lla,
        return 0;
 }
 
-extern int kernel_get_ipmr_sg_stats(void *mroute)
+extern int kernel_get_ipmr_sg_stats(struct zebra_vrf *zvrf, void *mroute)
 {
        return 0;
 }
@@ -447,4 +447,10 @@ int kernel_del_neigh(struct interface *ifp, struct ipaddr *ip)
        return 0;
 }
 
+extern int kernel_interface_set_master(struct interface *master,
+                                      struct interface *slave)
+{
+       return 0;
+}
+
 #endif /* !HAVE_NETLINK */