Merge remote-tracking branch 'origin/master' into thread-next

diff --cc doc/bird.sgml
Simple merge

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

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

diff --cc proto/bgp/config.Y
Simple merge

diff --cc proto/bgp/packets.c
index 4f6890f738b1b2c2d2d79cfa280675fda4884cad,4581e1f910f62cd5f5ff470a7cee79a0ec141445..bdbeabd12e454408ff104af616ef1f11dd3c262e
--- 1/proto/bgp/packets.c
--- 2/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@@ -1130,14 -1103,11 +1132,15 @@@ bgp_apply_next_hop(struct bgp_parse_sta
      if (nbr->scope == SCOPE_HOST)
        WITHDRAW(BAD_NEXT_HOP " - address %I is local", nbr->addr);
  
 -    a->dest = RTD_UNICAST;
 -    a->nh.gw = nbr->addr;
 -    a->nh.iface = nbr->iface;
 -    a->nh.flags = nbr->flags & NEF_ONLINK ? RNF_ONLINK : 0;
 -    a->igp_metric = c->cf->cost;
 +    ea_set_attr_u32(to, &ea_gen_igp_metric, 0, c->cf->cost);
 +
 +    struct nexthop_adata_mpls nam;
 +    memset(&nam, 0, sizeof nam);
 +    nam.nhad.nh.gw = nbr->addr;
 +    nam.nhad.nh.iface = nbr->iface;
++    nam.nhad.nh.flags = nbr->flags & NEF_ONLINK ? RNF_ONLINK : 0;
 +    nam.nhad.ad.length = NEXTHOP_NEXT(&nam.nhad.nh) - (void *) nam.nhad.ad.data;
 +    ea_set_attr_data(to, &ea_gen_nexthop, 0, nam.nhad.ad.data, nam.nhad.ad.length);
    }
    else /* GW_RECURSIVE */
    {