From: Maria Matejka <mq@ucw.cz>
Date: Thu, 12 Oct 2023 09:38:16 +0000 (+0200)
Subject: Merge commit 'e2f08c382a2adbbbd94c5cd7d996ce9175e0fb9c' into HEAD
X-Git-Tag: v3.0.0~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cfa9ac253aaae9ee757650e523c3b31edefaf94;p=thirdparty%2Fbird.git

Merge commit 'e2f08c382a2adbbbd94c5cd7d996ce9175e0fb9c' into HEAD
---

3cfa9ac253aaae9ee757650e523c3b31edefaf94
diff --cc proto/bgp/bgp.c
index 3c7bdab17,7ae688f50..7ac33b028
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@@ -125,16 -125,13 +125,18 @@@
  #include "lib/string.h"
  
  #include "bgp.h"
+ #ifdef CONFIG_BMP
  #include "proto/bmp/bmp.h"
+ #endif
  
 +static void bgp_listen_create(void *);
  
  static list STATIC_LIST_INIT(bgp_sockets);		/* Global list of listening sockets */
 +static list STATIC_LIST_INIT(bgp_listen_pending);	/* Global list of listening socket open requests */
 +static event bgp_listen_event = { .hook = bgp_listen_create };
  
 +static DOMAIN(rtable) bgp_listen_domain;
 +static pool *bgp_listen_pool;
  
  static void bgp_connect(struct bgp_proto *p);
  static void bgp_active(struct bgp_proto *p);