From: Maria Matejka <mq@ucw.cz>
Date: Tue, 4 Oct 2022 14:02:23 +0000 (+0200)
Subject: Merge commit 'e9e6baae' into HEAD
X-Git-Tag: v3.0-alpha1~105^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a414ba6b975a1187a59cac1f58bc68e5e4b7d37d;p=thirdparty%2Fbird.git

Merge commit 'e9e6baae' into HEAD
---

a414ba6b975a1187a59cac1f58bc68e5e4b7d37d
diff --cc sysdep/linux/netlink.c
index 099ae6e91,94a37a737..3443957b4
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -2012,6 -1874,6 +1874,9 @@@ nl_parse_route(struct nl_parse_state *s
        return;
      }
  
++  if (nhad.ad.length)
++    ea_set_attr(&ra, EA_LITERAL_DIRECT_ADATA(&ea_gen_nexthop, 0, &nhad.ad));
++
    if (i->rtm_scope != def_scope)
      ea_set_attr(&ra,
  	EA_LITERAL_EMBEDDED(&ea_krt_scope, 0, i->rtm_scope));