From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 17 May 2017 20:01:31 +0000 (-0400)
Subject: pimd: Use actual vrf table_id for pim vrf creation
X-Git-Tag: frr-4.0-dev~468^2~133
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=44a1bd88eed2af38f010a09f20d3d3a316120fa0;p=mirror%2Ffrr.git

pimd: Use actual vrf table_id for pim vrf creation

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index bb4086972b..089c2cc11f 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -59,7 +59,7 @@ static int pim_mroute_set(struct pim_instance *pim, int enable)
 				"pim_mroute_socket_enable: could not raise privs, %s",
 				safe_strerror(errno));
 
-		opt = pim->vrf_id;
+		opt = pim->vrf->data.l.table_id;
 		err = setsockopt(pim->mroute_socket, IPPROTO_IP, MRT_TABLE,
 				 &opt, opt_len);
 		if (err) {