From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 18 May 2017 13:45:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
X-Git-Tag: reindent-master-before~139^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ac139b5fb6f0a9f14ced54b9b7dcee9d2e98558e;p=mirror%2Ffrr.git

Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
---

ac139b5fb6f0a9f14ced54b9b7dcee9d2e98558e
diff --cc pimd/pim_ifchannel.c
index d4dbcb383d,d7df0735a7..9b79c032c8
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@@ -586,7 -596,9 +596,7 @@@ static int on_ifjoin_expiry_timer(struc
  
    ch = THREAD_ARG(t);
  
-   ifjoin_to_noinfo(ch);
 -  ch->t_ifjoin_expiry_timer = NULL;
 -
+   ifjoin_to_noinfo(ch, true);
    /* ch may have been deleted */
  
    return 0;