From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 23 Sep 2016 19:43:19 +0000 (+0000)
Subject: pimd: Fixup to use new lastused
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~202
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5f0336ed0285863c240911891b53fd11a63ada6e;p=mirror%2Ffrr.git

pimd: Fixup to use new lastused

The kernel now reports lastused as the time in hz since
we last saw any packets.  So let's start tracking it
that way.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index bc351d8f7b..a35c9898ce 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -743,7 +743,6 @@ pim_mroute_update_counters (struct channel_oil *c_oil)
   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;
-  c_oil->cc.oldlastused = c_oil->cc.lastused;
 
   pim_zlookup_sg_statistics (c_oil);
   if (ioctl (qpim_mroute_socket_fd, SIOCGETSGCNT, &sgreq))
diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h
index 1bbd232e4d..4b23b211a9 100644
--- a/pimd/pim_oil.h
+++ b/pimd/pim_oil.h
@@ -53,7 +53,6 @@
 struct channel_counts
 {
   unsigned long long lastused;
-  unsigned long long oldlastused;
   unsigned long pktcnt;
   unsigned long oldpktcnt;
   unsigned long bytecnt;
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 138843405b..64fffa3859 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -882,7 +882,7 @@ pim_upstream_keep_alive_timer (struct thread *t)
   pim_mroute_update_counters (up->channel_oil);
 
   if ((up->channel_oil->cc.oldpktcnt >= up->channel_oil->cc.pktcnt) &&
-      (up->channel_oil->cc.oldlastused >= up->channel_oil->cc.lastused))
+      (up->channel_oil->cc.lastused/100 >= qpim_keep_alive_time))
     {
       pim_mroute_del (up->channel_oil);
       THREAD_OFF (up->t_ka_timer);