]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Remove unnecessary NULL check
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 11 May 2017 00:06:17 +0000 (20:06 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 24 Jul 2017 17:51:34 +0000 (13:51 -0400)
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_ifchannel.c

index 40f7e47665e9b37e0b4b7ed1c4355f02df6b3e2b..058f99ca4d807f1c196fb1fde08fc72631311e84 100644 (file)
@@ -296,9 +296,8 @@ void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,
                                         * if channel.  So remove it.
                                         * I think this is dead code now. is it?
                                         */
-                                       if (!ch
-                                           && c_oil->oil.mfcc_ttls
-                                                      [pim_ifp->mroute_vif_index])
+                                       if (c_oil->oil.mfcc_ttls
+                                                   [pim_ifp->mroute_vif_index])
                                                pim_channel_del_oif(
                                                        c_oil, ch->interface,
                                                        PIM_OIF_FLAG_PROTO_STAR);