From: Maria Matejka <mq@ucw.cz>
Date: Tue, 4 Oct 2022 14:09:41 +0000 (+0200)
Subject: Merge commit 'fb7fb674' into HEAD
X-Git-Tag: v3.0-alpha1~105^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f69ba3921a1842f9cac9b9fbd0a32800615da02e;p=thirdparty%2Fbird.git

Merge commit 'fb7fb674' into HEAD
---

f69ba3921a1842f9cac9b9fbd0a32800615da02e
diff --cc nest/protocol.h
index b47301262,e9461d411..c88598ccb
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@@ -187,7 -188,8 +186,7 @@@ struct proto 
     *	   rte_remove	Called whenever a rte is removed from the routing table.
     */
  
-   int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
+   int (*rte_recalculate)(struct rtable_private *, struct network *, struct rte *, struct rte *, struct rte *);
 -  int (*rte_better)(struct rte *, struct rte *);
    int (*rte_mergable)(struct rte *, struct rte *);
    void (*rte_insert)(struct network *, struct rte *);
    void (*rte_remove)(struct network *, struct rte *);