Merge pull request #3068 from qlyoung/doc-ospf-multi-instance

[mirror_frr.git] / pimd / pim_static.c

diff --git a/pimd/pim_static.c b/pimd/pim_static.c
index 981335ea15c715eb9e27a0e340e216f2b8a3a5d0..9569b7dcac2fa86cfb91e2a329c3cdc202fda3f0 100644 (file)
--- a/pimd/pim_static.c
+++ b/pimd/pim_static.c
@@ -39,14 +39,7 @@ void pim_static_route_free(struct static_route *s_route)
 
 static struct static_route *static_route_alloc()
 {
-       struct static_route *s_route;
-
-       s_route = XCALLOC(MTYPE_PIM_STATIC_ROUTE, sizeof(*s_route));
-       if (!s_route) {
-               zlog_err("PIM XCALLOC(%zu) failure", sizeof(*s_route));
-               return 0;
-       }
-       return s_route;
+       return XCALLOC(MTYPE_PIM_STATIC_ROUTE, sizeof(struct static_route));
 }
 
 static struct static_route *static_route_new(unsigned int iif, unsigned int oif,
@@ -55,9 +48,6 @@ static struct static_route *static_route_new(unsigned int iif, unsigned int oif,
 {
        struct static_route *s_route;
        s_route = static_route_alloc();
-       if (!s_route) {
-               return 0;
-       }
 
        s_route->group = group;
        s_route->source = source;
@@ -337,7 +327,7 @@ int pim_static_del(struct pim_instance *pim, struct interface *iif,
        return 0;
 }
 
-int pim_static_write_mroute(struct vty *vty, struct pim_instance *pim,
+int pim_static_write_mroute(struct pim_instance *pim, struct vty *vty,
                            struct interface *ifp)
 {
        struct pim_interface *pim_ifp = ifp->info;
@@ -358,7 +348,8 @@ int pim_static_write_mroute(struct vty *vty, struct pim_instance *pim,
                        for (i = 0; i < MAXVIFS; i++)
                                if (sroute->oif_ttls[i]) {
                                        struct interface *oifp =
-                                               pim_if_find_by_vif_index(i);
+                                               pim_if_find_by_vif_index(pim,
+                                                                        i);
                                        if (sroute->source.s_addr == 0)
                                                vty_out(vty,
                                                        " ip mroute %s %s\n",