From: Maria Matejka <mq@ucw.cz>
Date: Mon, 30 May 2022 13:36:54 +0000 (+0200)
Subject: Merge commit '652be92a21f5575e5f74f6abe98eb4200b86776c' into haugesund
X-Git-Tag: v3.0-alpha1~171^2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45af19dd99b3c8f954621e09075e8be180e2f731;p=thirdparty%2Fbird.git

Merge commit '652be92a21f5575e5f74f6abe98eb4200b86776c' into haugesund
---

45af19dd99b3c8f954621e09075e8be180e2f731
diff --cc nest/rt-table.c
index 30208f3fb,82db879ed..fd6e13090
--- a/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/bgp/attrs.c
index 9f31c28bb,d8948f298..25f115af1
--- a/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)