From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 16 Oct 2017 16:00:38 +0000 (-0400)
Subject: Merge pull request #1298 from opensourcerouting/iface-rb-tree
X-Git-Tag: frr-4.0-dev~212
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5b8d8894f8ecb401acc9b3986bbb6ce95b3263e9;p=matthieu%2Ffrr.git

Merge pull request #1298 from opensourcerouting/iface-rb-tree

Use rb-trees to store interfaces instead of linked-lists
---

5b8d8894f8ecb401acc9b3986bbb6ce95b3263e9
diff --cc bgpd/bgp_zebra.c
index f979457244,53c5762cea..ddf461f1b1
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@@ -236,9 -232,13 +236,9 @@@ static int bgp_interface_delete(int com
  	if (BGP_DEBUG(zebra, ZEBRA))
  		zlog_debug("Rx Intf del VRF %u IF %s", vrf_id, ifp->name);
  
 -	bgp = bgp_lookup_by_vrf_id(vrf_id);
 -	if (!bgp)
 -		return 0;
 -
  	bgp_update_interface_nbrs(bgp, ifp, NULL);
  
- 	ifp->ifindex = IFINDEX_DELETED;
+ 	if_set_index(ifp, IFINDEX_INTERNAL);
  	return 0;
  }