From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 16 Aug 2016 20:19:14 +0000 (-0400)
Subject: pimd: Use correct function to delete upstream information
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~290
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=30df5c100e436a85429c11e57cf2f5fbba983bf1;p=mirror%2Ffrr.git

pimd: Use correct function to delete upstream information

When the keep alive timer finds that we are no longer
sending packets for that particular S,G, remove
the upstream information but use the function that
makes sure we check the ref count.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index bb322a7cdd..3685c6899f 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -826,7 +826,7 @@ pim_upstream_keep_alive_timer (struct thread *t)
       (up->channel_oil->cc.oldlastused >= up->channel_oil->cc.lastused))
     {
       pim_mroute_del (up->channel_oil);
-      pim_upstream_delete (up);
+      pim_upstream_del (up);
     }
   else
     {