From: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
Date: Tue, 29 Aug 2017 01:19:03 +0000 (-0700)
Subject: Merge branch 'master' into dev-master
X-Git-Tag: frr-4.0-dev~362^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F998%2Fhead;p=mirror%2Ffrr.git

Merge branch 'master' into dev-master
---

09fdc88c8cb0cd4169ae97b652d82f6a174a4041
diff --cc bgpd/bgp_route.c
index 36063af7cd,288271e5a1..b18ed9c71f
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -2044,12 -2042,11 +2042,10 @@@ static void bgp_process_main_one(struc
  
  	/* Do we need to allocate or free labels?
  	 * Right now, since we only deal with per-prefix labels, it is not
 -	 * necessary
 -	 * to do this upon changes to best path except of the label index
 -	 * changes.
 +	 * necessary to do this upon changes to best path except if the label
- 	 * index changes.
- 	 * NOTE: This is only relevant for the default instance.
++	 * index changes
  	 */
- 	if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT
- 	    && safi == SAFI_UNICAST) {
+ 	if (bgp->allocate_mpls_labels[afi][safi]) {
  		if (new_select) {
  			if (!old_select
  			    || bgp_label_index_differs(new_select, old_select)
diff --cc lib/command.c
index 9421fadc0b,c86025a3bd..24095de4f0
--- a/lib/command.c
+++ b/lib/command.c
@@@ -2621,9 -2579,8 +2641,10 @@@ void cmd_init(int terminal
  
  	install_element(CONFIG_NODE, &hostname_cmd);
  	install_element(CONFIG_NODE, &no_hostname_cmd);
 +	install_element(CONFIG_NODE, &domainname_cmd);
 +	install_element(CONFIG_NODE, &no_domainname_cmd);
  	install_element(CONFIG_NODE, &frr_version_defaults_cmd);
+ 	install_element(CONFIG_NODE, &debug_memstats_cmd);
  
  	if (terminal > 0) {
  		install_element(CONFIG_NODE, &password_cmd);