From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 1 Aug 2016 13:09:47 +0000 (-0400)
Subject: pimd: More macro fallout fix.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~330
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=13376be4f28cbc99394452f50ce214f7127f2965;p=matthieu%2Ffrr.git

pimd: More macro fallout fix.

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

diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 8dbf851aa9..62decfd5f9 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -39,8 +39,7 @@
 */
 static int downstream_jpstate_isjoined(const struct pim_ifchannel *ch)
 {
-  return (ch->ifjoin_state == PIM_IFJOIN_JOIN ||
-	  ch->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING);
+  return (ch->ifjoin_state != PIM_IFJOIN_NOINFO);
 }
 
 /*