From: Quentin Young Date: Fri, 30 Jun 2017 18:04:32 +0000 (+0000) Subject: bgpd: rebase onto master X-Git-Tag: frr-4.0-dev~120^2~19 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=152456fe234b0db1dbe6d5f49cac4158c8c64158;p=matthieu%2Ffrr.git bgpd: rebase onto master Signed-off-by: Quentin Young --- diff --git a/bgpd/bgp_keepalives.c b/bgpd/bgp_keepalives.c index 4de59da104..abe9739c98 100644 --- 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 6f1620faca..a673810738 100644 --- 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 */