From: Maria Matejka <mq@ucw.cz>
Date: Tue, 10 Dec 2024 22:55:05 +0000 (+0100)
Subject: Merge commit '946386f2' into thread-next
X-Git-Tag: v3.0.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f8eb2071056ebe0029619fb04b154be8b867667;p=thirdparty%2Fbird.git

Merge commit '946386f2' into thread-next
---

1f8eb2071056ebe0029619fb04b154be8b867667
diff --cc proto/mrt/mrt.c
index ff3b02279,1336837a8..cc5ad06a6
--- a/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@@ -628,11 -591,13 +628,14 @@@ mrt_table_dump_free(struct mrt_table_du
  }
  
  
 -static int
 -mrt_table_dump_step(struct mrt_table_dump_state *s)
 +static void
 +mrt_table_dump_step(void *_s)
  {
 +  struct mrt_table_dump_state *s = _s;
-   struct bgp_write_state bws = { .as4_session = 1 };
+   struct bgp_write_state bws = {
+     .as4_session = 1,
+     .ignore_non_bgp_attrs = 1,
+   };
  
    s->max = 2048;
    s->bws = &bws;