From: Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com>
Date: Mon, 10 Apr 2017 16:07:58 +0000 (-0500)
Subject: Merge pull request #304 from donaldsharp/pim_5549
X-Git-Tag: reindent-master-before~222
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b43d5ea3302a62133e249d0659e531becbcfbe8b;p=matthieu%2Ffrr.git

Merge pull request #304 from donaldsharp/pim_5549

Pim 5549 Additions
---

b43d5ea3302a62133e249d0659e531becbcfbe8b
diff --cc pimd/pimd.h
index 6c3dcfafca,7febc38fa7..ac2a3a408c
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@@ -247,11 -242,11 +247,14 @@@ struct pim_instanc
  {
    afi_t afi;
    vrf_id_t vrf_id;
 +
 +  enum pim_spt_switchover spt_switchover;
 +
    struct hash *rpf_hash;
+ 
    void *ssm_info; /* per-vrf SSM configuration */
+   
+   int send_v6_secondary;
  };
  
  extern struct pim_instance *pimg; //Pim Global Instance