Merge branch 'int-new' of gitlab.labs.nic.cz:labs/bird into int-new

diff --combined nest/rt-attr.c
index 6ec69a7fde93fcc1d25bb015bb386cf03a71ba32,5041ab9f53484fed0d44ec9039cbc1ce426d018e..167bfc44a9dd76d5eb64666bd4750b4c8f375eb4
--- 1/nest/rt-attr.c
--- 2/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@@ -353,7 -353,7 +353,7 @@@ ea_find(ea_list *e, unsigned id
   * for first occurrences of attributes with ID in specified interval from @id to
   * (@id + @max - 1), returning pointers to found &eattr structures, storing its
   * walk state in @s for subsequent calls.
- 
+  *
   * The function ea_walk() is supposed to be called in a loop, with initially
   * zeroed walk state structure @s with filled the initial extended attribute
   * list, returning one found attribute in each call or %NULL when no other
@@@ -946,7 -946,7 +946,7 @@@ rta_alloc_hash(void
  static inline uint
  rta_hash(rta *a)
  {
 -  mem_hash_t h;
 +  u64 h;
    mem_hash_init(&h);
  #define MIX(f) mem_hash_mix(&h, &(a->f), sizeof(a->f));
    MIX(src);
@@@ -961,7 -961,6 +961,7 @@@
    MIX(dest);
    MIX(flags);
    MIX(aflags);
 +#undef MIX
  
    return mem_hash_value(&h) ^ mpnh_hash(a->nexthops) ^ ea_hash(a->eattrs);
  }