]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'cae5979871ee7aa341334f8b1af6bafc60ee9692' into tmp-bad-learn
authorMaria Matejka <mq@ucw.cz>
Tue, 27 Sep 2022 10:39:07 +0000 (12:39 +0200)
committerMaria Matejka <mq@ucw.cz>
Tue, 27 Sep 2022 10:39:07 +0000 (12:39 +0200)
1  2 
sysdep/unix/krt.c

index 360a288812e6b1d9f018170fc6a90159174f4047,6e55d8f5e23fbd08362adb5cdc42a68599a70e19..84457d37f9524005ed4bf0deece8bbce153b23f6
@@@ -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);
  }
  
-   e->attrs->pref = p->p.main_channel->preference;
 +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);
 +  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)