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>
This commit is contained in:
Donald Sharp 2016-08-02 14:14:54 -04:00
parent 8a294fa2e4
commit facebf0509
2 changed files with 0 additions and 5 deletions

View File

@ -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:

View File

@ -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 {