From: Maria Matejka <mq@ucw.cz>
Date: Tue, 20 Sep 2022 07:14:39 +0000 (+0200)
Subject: Merge commit 'adf37d8e' into thread-next
X-Git-Tag: v3.0-alpha1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28427a68c32d5684652dd22400a9143722294886;p=thirdparty%2Fbird.git

Merge commit 'adf37d8e' into thread-next
---

28427a68c32d5684652dd22400a9143722294886
diff --cc nest/protocol.h
index 0bf894f80,1d4f20590..88bff0924
--- a/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 */