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

Merge commit 'cae5979871ee7aa341334f8b1af6bafc60ee9692' into tmp-bad-learn
---

32a67c93ebf29309286dca5195f026eeda3f78a2
diff --cc sysdep/unix/krt.c
index 360a28881,6e55d8f5e..84457d37f
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@@ -313,15 -319,6 +319,15 @@@ 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);
-   e->attrs->pref = p->p.main_channel->preference;
++  ea_set_attr_u32(&e->attrs->eattrs, &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)