From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 11 May 2017 00:06:17 +0000 (-0400)
Subject: pimd: Remove unnecessary NULL check
X-Git-Tag: frr-4.0-dev~468^2~143
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a88e628d296ef94ed98b096c3078557d9c20f470;p=mirror%2Ffrr.git

pimd: Remove unnecessary NULL check

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

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 40f7e47665..058f99ca4d 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -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);