From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 15 Nov 2016 17:09:14 +0000 (-0500)
Subject: pimd: Allow 'no ip pim sm' to not turn off igmp
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~92
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c83778f769238f9e9e943addb638825e9ed2b1da;p=mirror%2Ffrr.git

pimd: Allow 'no ip pim sm' to not turn off igmp

When we receive a 'no ip pim sm' for an interface
that has both pim and igmp on it, only turn
off pim.

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 84350676a7..c28aad0384 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -4315,12 +4315,6 @@ pim_cmd_interface_delete (struct interface *ifp)
 
   pim_if_membership_clear(ifp);
 
-  /*
-    pim_if_addr_del_all() removes all sockets from
-    pim_ifp->igmp_socket_list.
-   */
-  pim_if_addr_del_all(ifp);
-
   /*
     pim_sock_delete() removes all neighbors from
     pim_ifp->pim_neighbor_list.
@@ -4328,6 +4322,7 @@ pim_cmd_interface_delete (struct interface *ifp)
   pim_sock_delete(ifp, "pim unconfigured on interface");
 
   if (!PIM_IF_TEST_IGMP(pim_ifp->options)) {
+    pim_if_addr_del_all(ifp);
     pim_if_delete(ifp);
   }