From 9a0f71c994cf5505b0b2db26d2384e1a2cc3cb2a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 21 May 2017 09:16:49 -0400 Subject: [PATCH] pimd: Finish up pim_mroute.c 'struct pim_instance' awareness Signed-off-by: Donald Sharp --- pimd/pim_mroute.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 00f1bd6387..4195685f35 100644 --- 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; -- 2.39.5