From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 1 Apr 2017 11:58:05 +0000 (-0400)
Subject: Merge branch 'master' into pim_5549
X-Git-Tag: reindent-master-before~222^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2aaa554de9535e9299519d82b11f55f12c808975;p=mirror%2Ffrr.git

Merge branch 'master' into pim_5549
---

2aaa554de9535e9299519d82b11f55f12c808975
diff --cc pimd/pimd.h
index 8dc5899022,69aee28f8f..7febc38fa7
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@@ -240,8 -243,7 +243,10 @@@ struct pim_instanc
    afi_t afi;
    vrf_id_t vrf_id;
    struct hash *rpf_hash;
 +
+   void *ssm_info; /* per-vrf SSM configuration */
++  
 +  int send_v6_secondary;
  };
  
  extern struct pim_instance *pimg; //Pim Global Instance