From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 31 Jul 2013 16:36:26 +0000 (+0200)
Subject: Merge commit 'a0b176e3b2b50d3a30574afa927e0ee8ef65be68' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed5c7b636ed4194d730647d284735ed35a4efdc3;p=thirdparty%2Fbird.git

Merge commit 'a0b176e3b2b50d3a30574afa927e0ee8ef65be68' into integrated
---

ed5c7b636ed4194d730647d284735ed35a4efdc3
diff --cc nest/route.h
index f515b6e66,35b5fa193..b5dd7fb0d
--- a/nest/route.h
+++ b/nest/route.h
@@@ -307,12 -265,8 +307,11 @@@ void rt_dump(rtable *)
  void rt_dump_all(void);
  int rt_feed_baby(struct proto *p);
  void rt_feed_baby_abort(struct proto *p);
- void rt_schedule_prune_all(void);
  int rt_prune_loop(void);
 -struct rtable_config *rt_new_table(struct symbol *s);
 +struct rtable_config *rt_new_table(struct symbol *s, int addr_type);
 +static inline int rt_match(int rt, u32 rtlist) { return !rtlist || ((1 << rt)  & rtlist); }
 +int rt_addrsize(int addr_type); // XXXX needed?
 +
  
  struct rt_show_data {
    ip_addr prefix;