From: Maria Matejka <mq@ucw.cz>
Date: Tue, 27 Sep 2022 10:46:22 +0000 (+0200)
Subject: Merge commit '4364ee' into tmp-bad-learn
X-Git-Tag: v3.0-alpha1~107^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be7aa9b450f22cec9c97143d0cb7650f4fd7cc9;p=thirdparty%2Fbird.git

Merge commit '4364ee' into tmp-bad-learn
---

9be7aa9b450f22cec9c97143d0cb7650f4fd7cc9
diff --cc sysdep/linux/netlink.c
index a4172a6d4,d802d3e07..656202ac7
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -2044,11 -2042,11 +2042,10 @@@ nl_parse_route(struct nl_parse_state *s
      s->net = lp_alloc(s->pool, net->length);
      net_copy(s->net, net);
  
--    s->attrs = ra;
--
-     ea_set_attr_data(&ra->eattrs, &ea_gen_nexthop, 0,
+     ea_set_attr_data(&ra, &ea_gen_nexthop, 0,
  	nhad.ad.data, nhad.ad.length);
  
++    s->attrs = ra;
      s->proto = p;
      s->new = new;
      s->krt_src = krt_src;
diff --cc sysdep/unix/krt.c
index 84457d37f,a37d31866..4539feee5
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@@ -319,15 -319,6 +319,14 @@@ krt_learn_announce_delete(struct krt_pr
    rte_update(p->p.main_channel, n, NULL, p->p.main_source);
  }
  
 +static struct rte_storage *
 +krt_store_async(struct krt_proto *p, net *n, rte *e)
 +{
-   ASSERT(!e->attrs->cached);
-   ea_set_attr_u32(&e->attrs->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
++  ea_set_attr_u32(&e->attrs, &ea_gen_preference, 0, p->p.main_channel->preference);
 +  e->src = p->p.main_source;
 +  return rte_store(e, n, p->krt_table);
 +}
 +
  /* Called when alien route is discovered during scan */
  static void
  krt_learn_scan(struct krt_proto *p, rte *e)