From: Maria Matejka <mq@ucw.cz>
Date: Sat, 21 Jan 2023 22:46:33 +0000 (+0100)
Subject: Merge commit 'a80cd4707464cedb526eb72e7704b097af20beb7' into thread-next
X-Git-Tag: v3.0-alpha1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9df6d1bdf801ead054ed9f71ca5486a2f94450;p=thirdparty%2Fbird.git

Merge commit 'a80cd4707464cedb526eb72e7704b097af20beb7' into thread-next
---

0f9df6d1bdf801ead054ed9f71ca5486a2f94450
diff --cc sysdep/linux/netlink.c
index 8168d0dc6,dcb259117..288261f52
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@@ -26,9 -25,9 +25,10 @@@
  #include "lib/socket.h"
  #include "lib/string.h"
  #include "lib/hash.h"
 +#include "lib/macro.h"
  #include "conf/conf.h"
  
+ #ifdef CONFIG_LINUX_NETLINK
  #include <asm/types.h>
  #include <linux/if.h>
  #include <linux/netlink.h>