Merge commit '2e484f8d' into thread-next

diff --cc proto/bgp/attrs.c
index 91487faed0925fdccaeb8e09bc700b5fc20b2ba4,a56aeb19774d9a7959ea185cc4a78e29c2385b02..2543ee7344b08fd3a8e847bd8ac9317cefcfb459
--- 1/proto/bgp/attrs.c
--- 2/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)