pimd: Finish up pim_mroute.c 'struct pim_instance' awareness

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 00f1bd638743959edc93f453cb5596bd8dafc6fe..4195685f354501ef26db07f9041e4d58cd9db3b8 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -837,16 +837,11 @@ int pim_mroute_del_vif(struct interface *ifp)
 
 int pim_mroute_add(struct channel_oil *c_oil, const char *name)
 {
-       struct pim_instance *pim;
+       struct pim_instance *pim = c_oil->pim;
        int err;
        int orig = 0;
        int orig_iif_vif = 0;
 
-       if (c_oil->pim)
-               pim = c_oil->pim;
-       else
-               pim = pimg;
-
        pim->mroute_add_last = pim_time_monotonic_sec();
        ++pim->mroute_add_events;
 
@@ -917,14 +912,9 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
 
 int pim_mroute_del(struct channel_oil *c_oil, const char *name)
 {
-       struct pim_instance *pim;
+       struct pim_instance *pim = c_oil->pim;
        int err;
 
-       if (c_oil->pim)
-               pim = c_oil->pim;
-       else
-               pim = pimg;
-
        pim->mroute_del_last = pim_time_monotonic_sec();
        ++pim->mroute_del_events;
 
@@ -966,14 +956,9 @@ int pim_mroute_del(struct channel_oil *c_oil, const char *name)
 
 void pim_mroute_update_counters(struct channel_oil *c_oil)
 {
-       struct pim_instance *pim;
+       struct pim_instance *pim = c_oil->pim;
        struct sioc_sg_req sgreq;
 
-       if (c_oil->pim)
-               pim = c_oil->pim;
-       else
-               pim = pimg;
-
        c_oil->cc.oldpktcnt = c_oil->cc.pktcnt;
        c_oil->cc.oldbytecnt = c_oil->cc.bytecnt;
        c_oil->cc.oldwrong_if = c_oil->cc.wrong_if;