From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Dec 2015 23:26:56 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1171
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ef16372d77e3822c13f23370e55a280b784aeef2;p=mirror%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

ef16372d77e3822c13f23370e55a280b784aeef2
diff --cc bgpd/bgp_mpath.c
index 496ccdf11b,f7b13f5278..50813df034
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@@ -427,9 -427,10 +427,10 @@@ bgp_info_mpath_update (struct bgp_node 
    struct bgp_info *cur_mpath, *new_mpath, *next_mpath, *prev_mpath;
    int mpath_changed, debug;
    char pfx_buf[PREFIX2STR_BUFFER], nh_buf[2][INET6_ADDRSTRLEN];
+   char path_buf[PATH_ADDPATH_STR_BUFFER];
  
    mpath_changed = 0;
 -  maxpaths = BGP_DEFAULT_MAXPATHS;
 +  maxpaths = MULTIPATH_NUM;
    mpath_count = 0;
    cur_mpath = NULL;
    old_mpath_count = 0;