Merge commit 'e2f08c382a2adbbbd94c5cd7d996ce9175e0fb9c' into HEAD

diff --cc proto/bgp/bgp.c
index 3c7bdab17c102c91009521c0c314261fcdd8d6a2,7ae688f50fa7feacc5d465c4c733ed5f2d31b287..7ac33b02806a8e963d0d1718467e602ec723b5d6
--- 1/proto/bgp/bgp.c
--- 2/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);

diff --cc proto/bgp/packets.c
Simple merge