Merge commit 'v2.14-89-g74de3858' into thread-next

diff --cc proto/bgp/bgp.c
index 1bce53decbdbd013601337eefb31a1f9af2ebbd0,914935b925aa27a1ec1bc1a5da7c984fc1371bbd..dd47eb600d7000f9c93180f9f2bb0e91e5234dc2
--- 1/proto/bgp/bgp.c
--- 2/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@@ -709,23 -601,9 +706,9 @@@ bgp_conn_enter_established_state(struc
      const struct bgp_af_caps *loc = bgp_find_af_caps(local, c->afi);
      const struct bgp_af_caps *rem = bgp_find_af_caps(peer,  c->afi);
  
-     /* Use default if capabilities were not announced */
-     if (!local->length && (c->afi == BGP_AF_IPV4))
-       loc = &basic_af_caps;
- 
-     if (!peer->length && (c->afi == BGP_AF_IPV4))
-       rem = &basic_af_caps;
- 
-     /* Ignore AFIs that were not announced in multiprotocol capability */
-     if (!loc || !loc->ready)
-       loc = &dummy_af_caps;
- 
-     if (!rem || !rem->ready)
-       rem = &dummy_af_caps;
- 
      int active = loc->ready && rem->ready;
      c->c.disabled = !active;
 -    c->c.reloadable = p->route_refresh || c->cf->import_table;
 +    c->c.reloadable = p->route_refresh || ((c->c.in_keep & RIK_PREFILTER) == RIK_PREFILTER);
  
      c->index = active ? num++ : 0;
  

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