Merge commit 'ef4313e1667a8745c8d8813ac78342ec7c035895' into haugesund

diff --cc filter/f-inst.c
Simple merge

diff --cc lib/route.h
Simple merge

diff --cc proto/bgp/attrs.c
index 5df9c0f4221d8873914fd6fef386b7226a109bff,a7b6d0cd87798204b50049500cd84915f45c7f0d..e5165a96c3e8bcf7b56488237b7044ebe8f21111
--- 1/proto/bgp/attrs.c
--- 2/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@@ -2270,17 -2292,12 +2292,17 @@@ bgp_rte_modify_stale(struct rte *r, str
    if (ad && int_set_contains(ad, BGP_COMM_LLGR_STALE))
      return r;
  
 -  r = rte_cow_rta(r, pool);
 -  bgp_set_attr_ptr(&(r->attrs->eattrs), BA_COMMUNITY, flags,
 +  rta *a = rta_do_cow(r->attrs, pool);
 +  
 +  _Thread_local static rte e0;
 +  e0 = *r;
 +  e0.attrs = a;
 +
-   bgp_set_attr_ptr(&(a->eattrs), pool, BA_COMMUNITY, flags,
++  bgp_set_attr_ptr(&(a->eattrs), BA_COMMUNITY, flags,
                   int_set_add(pool, ad, BGP_COMM_LLGR_STALE));
 -  r->pflags |= BGP_REF_STALE;
 +  e0.pflags |= BGP_REF_STALE;
  
 -  return r;
 +  return &e0;
  }
  
  

diff --cc proto/bgp/bgp.h
Simple merge

diff --cc proto/bgp/packets.c
Simple merge