bgpd: rebase onto master

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c
index 4de59da1042c40950fde496b7f4faa7667acb9cc..abe9739c98881519e52c48cdadec0c1da8c46d4c 100644 (file)
--- a/bgpd/bgp_keepalives.c
+++ b/bgpd/bgp_keepalives.c
@@ -155,7 +155,7 @@ void bgp_keepalives_init()
        pthread_condattr_destroy(&attrs);
 
        // initialize peer hashtable
-       peerhash = hash_create_size(2048, peer_hash_key, peer_hash_cmp);
+       peerhash = hash_create_size(2048, peer_hash_key, peer_hash_cmp, NULL);
 }
 
 static void bgp_keepalives_finish(void *arg)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 6f1620faca376613c723f301a8509f2b099e30f1..a6738107381bf62b187a57ceab24e724776cf464 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1367,7 +1367,7 @@ void bgp_config_write_wpkt_quanta(struct vty *vty, struct bgp *bgp)
        uint32_t quanta =
                atomic_load_explicit(&bgp->wpkt_quanta, memory_order_relaxed);
        if (quanta != BGP_WRITE_PACKET_MAX)
-               vty_out(vty, " write-quanta %d%s", quanta, VTY_NEWLINE);
+               vty_out(vty, " write-quanta %d\n", quanta);
 }
 
 void bgp_config_write_rpkt_quanta(struct vty *vty, struct bgp *bgp)
@@ -1375,7 +1375,7 @@ void bgp_config_write_rpkt_quanta(struct vty *vty, struct bgp *bgp)
        uint32_t quanta =
                atomic_load_explicit(&bgp->rpkt_quanta, memory_order_relaxed);
        if (quanta != BGP_READ_PACKET_MAX)
-               vty_out(vty, " read-quanta %d%s", quanta, VTY_NEWLINE);
+               vty_out(vty, " read-quanta %d\n", quanta);
 }
 
 /* Packet quanta configuration */