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

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

e6362b21dcf5b41bb66d2fd6ccbef0a2e947a2c1
diff --cc nest/mpls.c
index 30b101923,b57eb9928..0effb3392
--- a/nest/mpls.c
+++ b/nest/mpls.c
@@@ -639,8 -677,9 +677,9 @@@ HASH_DEFINE_REHASH_FN(RTA, struct mpls_
  HASH_DEFINE_REHASH_FN(LABEL, struct mpls_fec)
  
  
+ static void mpls_unlink_fec(struct mpls_fec_map *m, struct mpls_fec *fec);
  static void mpls_withdraw_fec(struct mpls_fec_map *m, struct mpls_fec *fec);
 -static rta * mpls_get_key_rta(struct mpls_fec_map *m, const rta *src);
 +static struct ea_storage * mpls_get_key_attrs(struct mpls_fec_map *m, ea_list *src);
  
  struct mpls_fec_map *
  mpls_fec_map_new(pool *pp, struct channel *C, uint rts)
diff --cc nest/proto.c
index 9be4daee5,88f4813ef..50f302a92
--- a/nest/proto.c
+++ b/nest/proto.c
@@@ -1544,11 -997,16 +1544,11 @@@ proto_setup_mpls_map(struct proto *p, u
    }
    else if (m && c)
    {
-     // mpls_fec_map_reconfigure(m, c);
+     mpls_fec_map_reconfigure(m, c);
    }
 -
 -  if (hooks)
 -  {
 -    p->rte_insert = p->mpls_map ? mpls_rte_insert : NULL;
 -    p->rte_remove = p->mpls_map ? mpls_rte_remove : NULL;
 -  }
  }
  
 +
  /**
   * proto_shutdown_mpls_map - automatically shutdown FEC map for protocol
   * @p: affected protocol