From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 3 Dec 2024 14:45:25 +0000 (+0100)
Subject: Merge commit '460321cfe979459e3b78ba87694f29865d321612' into thread-next
X-Git-Tag: v3.0.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aea356b2ae670bd6a58f1a5fdb344c52afdb4a3;p=thirdparty%2Fbird.git

Merge commit '460321cfe979459e3b78ba87694f29865d321612' into thread-next
---

6aea356b2ae670bd6a58f1a5fdb344c52afdb4a3
diff --cc proto/bmp/bmp.c
index d880545ad,599024f55..011b276e7
--- a/proto/bmp/bmp.c
+++ b/proto/bmp/bmp.c
@@@ -1392,10 -1243,9 +1392,9 @@@ bmp_start(struct proto *P
  {
    struct bmp_proto *p = (void *) P;
  
 -  p->buffer_mpool = rp_new(P->pool, "BMP Buffer");
 -  p->tx_mem_pool = rp_new(P->pool, "BMP Tx");
 -  p->update_msg_mem_pool = rp_new(P->pool, "BMP Update");
 +  p->buffer_mpool = rp_new(P->pool, proto_domain(&p->p), "BMP Buffer");
-   p->map_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Map");
 +  p->tx_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Tx");
 +  p->update_msg_mem_pool = rp_new(P->pool, proto_domain(&p->p), "BMP Update");
    p->tx_ev = ev_new_init(p->p.pool, bmp_fire_tx, p);
    p->update_ev = ev_new_init(p->p.pool, bmp_route_monitor_commit, p);
    p->connect_retry_timer = tm_new_init(p->p.pool, bmp_connection_retry, p, 0, 0);