From: Maria Matejka <mq@ucw.cz>
Date: Thu, 9 Nov 2023 14:59:03 +0000 (+0100)
Subject: Merge branch 'mq-aggregator-for-v3' into thread-next
X-Git-Tag: v3.0.0~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2f612e2f15b2fce8b014fadf6ec9f896a023f6;p=thirdparty%2Fbird.git

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

8f2f612e2f15b2fce8b014fadf6ec9f896a023f6
diff --cc nest/mpls.c
index 40c611d39,ba9854fd9..85fce9961
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@@ -780,9 -788,10 +787,9 @@@ mpls_get_fec_by_destination(struct mpls
    fec = sl_allocz(mpls_slab(m, 0));
  
    fec->hash = hash;
 -  fec->class_id = class_id;
    fec->rta = rta;
  
-   fec->label = mpls_new_label(m->domain, m->handle);
+   fec->label = mpls_new_label(m->domain, m->handle, 0);
    fec->policy = MPLS_POLICY_AGGREGATE;
  
    DBG("New FEC rta %u\n", fec->label);