From: Maria Matejka <mq@ucw.cz>
Date: Wed, 1 Nov 2023 16:44:37 +0000 (+0100)
Subject: Merge branch 'mq-aggregator-for-v3' into thread-next
X-Git-Tag: v3.0.0~360
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32e53d7b183fb399b6f17ebbbb7a29ce158ec80;p=thirdparty%2Fbird.git

Merge branch 'mq-aggregator-for-v3' into thread-next
---

f32e53d7b183fb399b6f17ebbbb7a29ce158ec80
diff --cc proto/aggregator/aggregator.c
index 5df9ad405,b7b565178..c13b93adb
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@@ -74,7 -74,8 +74,8 @@@ aggregator_bucket_update(struct aggrega
    /* Empty bucket */
    if (!bucket->rte)
    {
 -    rte_update2(p->dst, net->n.addr, NULL, bucket->last_src);
 +    rte_update(p->dst, net, NULL, bucket->last_src);
+     rt_unlock_source(bucket->last_src);
      bucket->last_src = NULL;
      return;
    }