From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 2 Aug 2016 18:14:54 +0000 (-0400)
Subject: pimd: Remove Wrong PIMREG ifchannel state
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~322
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=facebf05097cd02b20bc89bde7e2fa9a8c434bdf;p=mirror%2Ffrr.git

pimd: Remove Wrong PIMREG ifchannel state

The PIMREG ifchannel state is an evolutionary dead-end.
I should not have introduced this code.

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

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index bbab8197dd..f1da740e78 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -209,7 +209,6 @@ const char *pim_ifchannel_ifjoin_name(enum pim_ifjoin_state ifjoin_state)
 {
   switch (ifjoin_state) {
   case PIM_IFJOIN_NOINFO:        return "NOINFO";
-  case PIM_IFJOIN_JOIN_PIMREG:   return "REGT";
   case PIM_IFJOIN_JOIN:          return "JOIN";
   case PIM_IFJOIN_PRUNE_PENDING: return "PRUNEP";
   }
@@ -684,8 +683,6 @@ void pim_ifchannel_join_add(struct interface *ifp,
     THREAD_OFF(ch->t_ifjoin_prune_pending_timer);
     pim_ifchannel_ifjoin_switch(__PRETTY_FUNCTION__, ch, PIM_IFJOIN_JOIN);
     break;
-  case PIM_IFJOIN_JOIN_PIMREG:
-    zlog_warn("Received Incorrect new state");
   }
 
   zassert(!IFCHANNEL_NOINFO(ch));
@@ -718,7 +715,6 @@ void pim_ifchannel_prune(struct interface *ifp,
   switch (ch->ifjoin_state) {
   case PIM_IFJOIN_NOINFO:
   case PIM_IFJOIN_PRUNE_PENDING:
-  case PIM_IFJOIN_JOIN_PIMREG:
     /* nothing to do */
     break;
   case PIM_IFJOIN_JOIN:
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index 2767e4862b..eb6b0925a8 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -38,7 +38,6 @@ enum pim_ifjoin_state {
   PIM_IFJOIN_NOINFO,
   PIM_IFJOIN_JOIN,
   PIM_IFJOIN_PRUNE_PENDING,
-  PIM_IFJOIN_JOIN_PIMREG,
 };
 
 enum pim_ifassert_state {