From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 22 Mar 2019 07:45:48 +0000 (-0400)
Subject: Merge pull request #3776 from opensourcerouting/pbrd-interface-nexthops
X-Git-Tag: frr-7.1~166
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8d39ebf675a8a2fafde0dfa74ed927f364b3c6db;p=mirror_frr.git

Merge pull request #3776 from opensourcerouting/pbrd-interface-nexthops

pbrd: add support for interface nexthops
---

8d39ebf675a8a2fafde0dfa74ed927f364b3c6db
diff --cc lib/nexthop_group.c
index f940418d8,bf298c6de..27ab04279
--- a/lib/nexthop_group.c
+++ b/lib/nexthop_group.c
@@@ -205,10 -219,15 +219,13 @@@ static int nhgl_cmp(struct nexthop_hol
  
  static void nhgl_delete(struct nexthop_hold *nh)
  {
 -	if (nh->intf)
 -		XFREE(MTYPE_TMP, nh->intf);
 +	XFREE(MTYPE_TMP, nh->intf);
  
 -	if (nh->nhvrf_name)
 -		XFREE(MTYPE_TMP, nh->nhvrf_name);
 +	XFREE(MTYPE_TMP, nh->nhvrf_name);
  
+ 	if (nh->addr)
+ 		sockunion_free(nh->addr);
+ 
  	XFREE(MTYPE_TMP, nh);
  }