Merge commit 'e42eedb9' into haugesund

diff --cc doc/bird.sgml
Simple merge

diff --cc filter/test.conf
Simple merge

diff --cc nest/config.Y
Simple merge

diff --cc nest/route.h
index 19c1353857e4d94f4ac39df95ec9ff32de79db17,d2c4adefed1242e794b5a75c6c1128b856765800..9fd3bdcc5a798bf56b5940d7fbe147a13ae555da
--- 1/nest/route.h
--- 2/nest/route.h
+++ b/nest/route.h
@@@ -281,23 -248,8 +267,9 @@@ typedef struct rte 
      struct {
        u8 suppressed;                  /* Used for deterministic MED comparison */
        s8 stale;                               /* Route is LLGR_STALE, -1 if unknown */
 +      struct rtable *base_table;      /* Base table for Flowspec validation */
      } bgp;
  #endif
- #ifdef CONFIG_BABEL
-     struct {
-       u16 seqno;                      /* Babel seqno */
-       u16 metric;                     /* Babel metric */
-       u64 router_id;                  /* Babel router id */
-     } babel;
- #endif
-     struct {                          /* Routes generated by krt sync (both temporary and inherited ones) */
-       s8 src;                         /* Alleged route source (see krt.h) */
-       u8 proto;                               /* Kernel source protocol ID */
-       u8 seen;                                /* Seen during last scan */
-       u8 best;                                /* Best route in network, propagated to core */
-       u32 metric;                     /* Kernel metric */
-     } krt;
    } u;
  } rte;
  

diff --cc nest/rt-table.c
Simple merge

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

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

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

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

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/linux/netlink.c
Simple merge