From: Sarita Patra <saritap@vmware.com>
Date: Wed, 8 Jun 2022 07:50:48 +0000 (-0700)
Subject: pim6d: creating pim6reg interface for pim6d
X-Git-Tag: base_8.4~356^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ee1c4ba977c2a0a6d104ac3776733e537471df32;p=mirror%2Ffrr.git

pim6d: creating pim6reg interface for pim6d

Signed-off-by: Sarita Patra <saritap@vmware.com>
---

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 65889fd57b..95a5bb6032 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -1546,9 +1546,9 @@ void pim_if_create_pimreg(struct pim_instance *pim)
 
 	if (!pim->regiface) {
 		if (pim->vrf->vrf_id == VRF_DEFAULT)
-			strlcpy(pimreg_name, "pimreg", sizeof(pimreg_name));
+			strlcpy(pimreg_name, PIMREG, sizeof(pimreg_name));
 		else
-			snprintf(pimreg_name, sizeof(pimreg_name), "pimreg%u",
+			snprintf(pimreg_name, sizeof(pimreg_name), PIMREG "%u",
 				 pim->vrf->data.l.table_id);
 
 		pim->regiface = if_get_by_name(pimreg_name, pim->vrf->vrf_id,
@@ -1718,7 +1718,7 @@ static int pim_ifp_up(struct interface *ifp)
 	 * If we have a pimreg device callback and it's for a specific
 	 * table set the master appropriately
 	 */
-	if (sscanf(ifp->name, "pimreg%" SCNu32, &table_id) == 1) {
+	if (sscanf(ifp->name, "" PIMREG "%" SCNu32, &table_id) == 1) {
 		struct vrf *vrf;
 		RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
 			if ((table_id == vrf->data.l.table_id)