Merge commit 'adf37d8e' into thread-next

diff --cc nest/config.Y
Simple merge

diff --cc nest/iface.c
Simple merge

diff --cc nest/neighbor.c
Simple merge

diff --cc nest/proto.c
Simple merge

diff --cc nest/protocol.h
index 0bf894f805f87403a411883c1d2fd11a8b18e782,1d4f205907ec9e01203702f8dfe25044718fe513..88bff09243fa9197eca29e91df47e39136343197
--- 1/nest/protocol.h
--- 2/nest/protocol.h
+++ b/nest/protocol.h
@@@ -134,10 -150,9 +133,9 @@@ struct proto 
    u32 debug;                          /* Debugging flags */
    u32 mrtdump;                                /* MRTDump flags */
    uint active_channels;                       /* Number of active channels */
 -  uint active_coroutines;             /* Number of active coroutines */
 +  uint active_loops;                  /* Number of active IO loops */
    byte net_type;                      /* Protocol network type (NET_*), 0 for undefined */
    byte disabled;                      /* Manually disabled */
-   byte vrf_set;                               /* Related VRF instance (above) is defined */
    byte proto_state;                   /* Protocol state machine (PS_*, see below) */
    byte active;                                /* From PS_START to cleanup after PS_STOP */
    byte do_stop;                               /* Stop actions are scheduled */

diff --cc proto/bfd/bfd.c
Simple merge