Merge commit 'fb7fb674' into HEAD

diff --cc nest/protocol.h
index b473012620498ccb379d0cbb7dac7b9a9c5421ed,e9461d411948c07223bb862879d0040d5125982a..c88598ccb6734e7d52a79f6b6d3978e55c8242c7
--- 1/nest/protocol.h
--- 2/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 *);

diff --cc sysdep/unix/krt.c
Simple merge