Merge commit 'a80cd4707464cedb526eb72e7704b097af20beb7' into thread-next

diff --cc sysdep/linux/netlink.c
index 8168d0dc6d5e6e897a5537a51fc72b51a07283ec,dcb2591179129a35361ac2d5b936491ac04ea92f..288261f5259484e33c6d5217c29d14ad3a4d1073
--- 1/sysdep/linux/netlink.c
--- 2/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>