Merge branch 'stable/3.0' into pim_dev_3_0

diff --cc pimd/pim_cmd.c
Simple merge

diff --cc pimd/pim_ifchannel.c
Simple merge

diff --cc pimd/pim_upstream.c
index 1c92a87a161238f6e74544b92cebbb280ad03df2,9f645cace3a8df1cd870ded1a4981a17bcb6c83b..1e31a3aba1e3459e200548632607ca833ee0200e
--- 1/pimd/pim_upstream.c
--- 2/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@@ -1447,19 -1398,14 +1412,20 @@@ pim_upstream_start_register_stop_timer 
  int
  pim_upstream_inherited_olist_decide (struct pim_upstream *up)
  {
+   struct interface *ifp;
    struct pim_interface *pim_ifp = NULL;
-   struct listnode *chnextnode;
-   struct pim_ifchannel *ch;
-   struct listnode *chnode;
+   struct pim_ifchannel *ch, *starch;
+   struct listnode *node;
+   struct pim_upstream *starup = up->parent;
    int output_intf = 0;
  
 -  pim_ifp = up->rpf.source_nexthop.interface->info;
 +  if (up->rpf.source_nexthop.interface)
 +    pim_ifp = up->rpf.source_nexthop.interface->info;
 +  else
 +    {
 +      if (PIM_DEBUG_TRACE)
 +        zlog_debug ("%s: up %s RPF is not present", __PRETTY_FUNCTION__, up->sg_str);
 +    }
    if (pim_ifp && !up->channel_oil)
      up->channel_oil = pim_channel_oil_add (&up->sg, pim_ifp->mroute_vif_index);
  

diff --cc pimd/pimd.c
Simple merge

diff --cc pimd/pimd.h
Simple merge