Merge commit 'f4a94644d' into thread-next

diff --cc doc/bird.sgml
Simple merge

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

diff --cc proto/bgp/bgp.h
index 5d9abc0ca36e62ef8beea8526facbd53c8a6e6e5,5ec7a9f9460270f3744a58f43095478289c693ca..083d754262ac61a196255ab8e7715e90120870e9
--- 1/proto/bgp/bgp.h
--- 2/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@@ -524,7 -463,9 +529,8 @@@ struct bgp_write_state 
    int mp_reach;
    int as4_session;
    int add_path;
+   int llnh_format;
    int mpls;
 -  int sham;
    int ignore_non_bgp_attrs;
  
    eattr *mp_next_hop;

diff --cc proto/bgp/config.Y
index 4892eeaac198fe503b4aa55eb823d4ba1d841345,11003d4e904ff850ce6671f510d710d6f0c117c1..17906d75ab3a2a5c99f2a041abf1242bcbfc58e6
--- 1/proto/bgp/config.Y
--- 2/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@@ -29,14 -30,12 +29,14 @@@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, H
        GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
        STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,
        LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
 -      DYNAMIC, RANGE, NAME, DIGITS, BGP_AIGP, AIGP, ORIGINATE, COST, ENFORCE,
 +      DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
        FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
 -      RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, MIN, MAX,
 -      FORMAT, NATIVE, SINGLE, DOUBLE)
 +      RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, TX, SIZE, WARNING,
-       MIN, MAX)
++      MIN, MAX, FORMAT, NATIVE, SINGLE, DOUBLE)
 +
 +CF_ENUM(T_ENUM_BGP_ORIGIN, ORIGIN_, IGP, EGP, INCOMPLETE)
  
- %type <i> bgp_nh
+ %type <i> bgp_nh bgp_llnh
  %type <i32> bgp_afi
  
  CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER,

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