Merge commit '652be92a21f5575e5f74f6abe98eb4200b86776c' into haugesund

diff --cc doc/bird.sgml
Simple merge

diff --cc filter/f-inst.c
Simple merge

diff --cc nest/rt-table.c
index 30208f3fb9c2929340eda45d04fa9e3436da2706,82db879ed47548ae9e9f964758fe53e11c2181f1..fd6e1309058c6580bd40be776e3bd48872caa0ae
--- 1/nest/rt-table.c
--- 2/nest/rt-table.c
+++ b/nest/rt-table.c
@@@ -2294,9 -2170,9 +2294,9 @@@ static voi
  rt_prune_table(rtable *tab)
  {
    struct fib_iterator *fit = &tab->prune_fit;
-   int limit = 512;
+   int limit = 2000;
  
 -  struct channel *c;
 +  struct rt_import_hook *ih;
    node *n, *x;
  
    DBG("Pruning route table %s\n", tab->name);

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

diff --cc proto/bgp/attrs.c
index 9f31c28bb50f52bc98bf1bb078410a112551741b,d8948f298d179f085340682ab370b37ee7df3ff0..25f115af14ebf10c463b279b4799daf0e877a49d
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -1631,9 -1631,10 +1631,10 @@@ bgp_free_prefix_table(struct bgp_channe
  }
  
  static struct bgp_prefix *
 -bgp_get_prefix(struct bgp_channel *c, net_addr *net, u32 path_id)
 +bgp_get_prefix(struct bgp_channel *c, const net_addr *net, u32 path_id)
  {
-   u32 hash = net_hash(net) ^ u32_hash(path_id);
+   /* We must use a different hash function than the rtable */
+   u32 hash = u32_hash(net_hash(net) ^ u32_hash(path_id));
    struct bgp_prefix *px = HASH_FIND(c->prefix_hash, PXH, net, path_id, hash);
  
    if (px)

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

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