diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-13 22:00:55 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-10-13 22:00:55 +0200 |
| commit | 87d4a78163b31b107707471688ec2904aabf28bd (patch) | |
| tree | 60c83e20905878ed1c3608126033bb3563e76059 /bgpd/bgp_main.c | |
| parent | lib: fix vty.c and smux.c static variable clash (diff) | |
| download | frr-87d4a78163b31b107707471688ec2904aabf28bd.tar.xz frr-87d4a78163b31b107707471688ec2904aabf28bd.zip | |
bgpd: backout change of bm->master and master
Upstream does wanted the reverse of what was done
in this patch. Back out the patch.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'bgpd/bgp_main.c')
| -rw-r--r-- | bgpd/bgp_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 2a9f7a223..09e83b8a5 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -329,7 +329,6 @@ main (int argc, char **argv) /* BGP master init. */ bgp_master_init (); - master = thread_master_create(); /* Command line argument treatment. */ while (1) @@ -408,6 +407,9 @@ main (int argc, char **argv) } } + /* Make thread master. */ + master = bm->master; + /* Initializations. */ srand (time (NULL)); signal_init (master, array_size(bgp_signals), bgp_signals); |