From: Maria Matejka <mq@ucw.cz>
Date: Fri, 5 Aug 2022 08:31:40 +0000 (+0200)
Subject: Merge commit '2e484f8d' into thread-next
X-Git-Tag: v3.0-alpha1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed6d0be93e79e8eb1867749e11e062f5cfe3f5c;p=thirdparty%2Fbird.git

Merge commit '2e484f8d' into thread-next
---

3ed6d0be93e79e8eb1867749e11e062f5cfe3f5c
diff --cc proto/bgp/attrs.c
index 91487faed,a56aeb197..2543ee734
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2001,9 -1720,10 +2001,9 @@@ bgp_setup_out_table(struct bgp_channel 
  int
  bgp_preexport(struct channel *C, rte *e)
  {
-   struct bgp_channel *c = (struct bgp_channel *) C;
 -  struct proto *SRC = e->src->proto;
    struct bgp_proto *p = (struct bgp_proto *) C->proto;
 -  struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;
 +  struct bgp_proto *src = bgp_rte_proto(e);
+   struct bgp_channel *c = (struct bgp_channel *) C;
  
    /* Reject our routes */
    if (src == p)