From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 25 Jun 2017 00:40:29 +0000 (+0000)
Subject: Include "netlink.h" instead of <linux/netlink.h>
X-Git-Tag: v4.18~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a2a9a7cb1d0e0fc770fa6400b009f8319c52d96;p=strace

Include "netlink.h" instead of <linux/netlink.h>

* net.c: Include "netlink.h" instead of <linux/netlink.h>.
* sockaddr.c: Likewise.
* tests/create_nl_socket.c: Likewise.
* tests/net-sockaddr.c: Likewise.
* tests/netlink_audit.c: Likewise.
* tests/netlink_generic.c: Likewise.
* tests/netlink_inet_diag.c: Likewise.
* tests/netlink_netfilter.c: Likewise.
* tests/netlink_route.c: Likewise.
* tests/netlink_selinux.c: Likewise.
* tests/netlink_xfrm.c: Likewise.
* tests/net-yy-netlink.c: Include "netlink.h" instead
of <linux/netlink.h>, remove fallback definition of NETLINK_SOCK_DIAG.
* tests/netlink_netlink_diag.c: Likewise.
* tests/netlink_protocol.c: Likewise.
* tests/netlink_sock_diag.c: Likewise.
* tests/netlink_unix_diag.c: Likewise.
* tests/nlattr.c: Likewise.
---

diff --git a/net.c b/net.c
index 87b35514..8dc47fc7 100644
--- a/net.c
+++ b/net.c
@@ -56,7 +56,7 @@
 #if defined(HAVE_LINUX_IP_VS_H)
 # include <linux/ip_vs.h>
 #endif
-#include <linux/netlink.h>
+#include "netlink.h"
 #if defined(HAVE_LINUX_NETFILTER_ARP_ARP_TABLES_H)
 # include <linux/netfilter_arp/arp_tables.h>
 #endif
diff --git a/sockaddr.c b/sockaddr.c
index 0df4e805..bfbe585b 100644
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -35,7 +35,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/if_packet.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
diff --git a/tests/create_nl_socket.c b/tests/create_nl_socket.c
index 9b4904a2..064960fa 100644
--- a/tests/create_nl_socket.c
+++ b/tests/create_nl_socket.c
@@ -27,7 +27,7 @@
 
 #include "tests.h"
 #include <sys/socket.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 
 int
 create_nl_socket_ext(const int proto, const char *const name)
diff --git a/tests/net-sockaddr.c b/tests/net-sockaddr.c
index 9dc9ecf5..1d9bac39 100644
--- a/tests/net-sockaddr.c
+++ b/tests/net-sockaddr.c
@@ -37,11 +37,11 @@
 #include <sys/un.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include "netlink.h"
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
 #include <linux/ipx.h>
-#include <linux/netlink.h>
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 # include <bluetooth/bluetooth.h>
 # include <bluetooth/hci.h>
diff --git a/tests/net-yy-netlink.c b/tests/net-yy-netlink.c
index 6539edab..8ccf5bc0 100644
--- a/tests/net-yy-netlink.c
+++ b/tests/net-yy-netlink.c
@@ -36,14 +36,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/netlink_diag.h>
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 int
 main(void)
 {
diff --git a/tests/netlink_audit.c b/tests/netlink_audit.c
index c13feeac..00ddc4f3 100644
--- a/tests/netlink_audit.c
+++ b/tests/netlink_audit.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <linux/audit.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 
 static void
 test_nlmsg_type(const int fd)
diff --git a/tests/netlink_generic.c b/tests/netlink_generic.c
index 31f4f45e..4f80c8b5 100644
--- a/tests/netlink_generic.c
+++ b/tests/netlink_generic.c
@@ -34,7 +34,7 @@
 # include <string.h>
 # include <unistd.h>
 # include <sys/socket.h>
-# include <linux/netlink.h>
+# include "netlink.h"
 # include <linux/genetlink.h>
 
 static void
diff --git a/tests/netlink_inet_diag.c b/tests/netlink_inet_diag.c
index 2332e203..5f68cb3c 100644
--- a/tests/netlink_inet_diag.c
+++ b/tests/netlink_inet_diag.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/inet_diag.h>
 
diff --git a/tests/netlink_netfilter.c b/tests/netlink_netfilter.c
index 0c64b108..2907c261 100644
--- a/tests/netlink_netfilter.c
+++ b/tests/netlink_netfilter.c
@@ -33,8 +33,8 @@
 # include <string.h>
 # include <unistd.h>
 # include <sys/socket.h>
+# include "netlink.h"
 # include <linux/netfilter/nfnetlink.h>
-# include <linux/netlink.h>
 
 static void
 test_nlmsg_type(const int fd)
diff --git a/tests/netlink_netlink_diag.c b/tests/netlink_netlink_diag.c
index fc32822b..d7e83f5c 100644
--- a/tests/netlink_netlink_diag.c
+++ b/tests/netlink_netlink_diag.c
@@ -33,14 +33,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/netlink_diag.h>
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 static void
 send_query(const int fd)
 {
diff --git a/tests/netlink_protocol.c b/tests/netlink_protocol.c
index 07e02108..d0479805 100644
--- a/tests/netlink_protocol.c
+++ b/tests/netlink_protocol.c
@@ -32,20 +32,16 @@
 
 #ifdef HAVE_SYS_XATTR_H
 
-# include "netlink.h"
 # include <stdio.h>
 # include <stdlib.h>
 # include <string.h>
 # include <unistd.h>
 # include <sys/xattr.h>
 # include <netinet/in.h>
+# include "netlink.h"
 # include <linux/sock_diag.h>
 # include <linux/netlink_diag.h>
 
-# if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-#  define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-# endif
-
 static void
 send_query(const int fd)
 {
diff --git a/tests/netlink_route.c b/tests/netlink_route.c
index 71458d0f..54a54b7e 100644
--- a/tests/netlink_route.c
+++ b/tests/netlink_route.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/rtnetlink.h>
 
 static void
diff --git a/tests/netlink_selinux.c b/tests/netlink_selinux.c
index 6a6652f8..6494fda9 100644
--- a/tests/netlink_selinux.c
+++ b/tests/netlink_selinux.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/selinux_netlink.h>
 
 static void
diff --git a/tests/netlink_sock_diag.c b/tests/netlink_sock_diag.c
index 86a42643..b8d01904 100644
--- a/tests/netlink_sock_diag.c
+++ b/tests/netlink_sock_diag.c
@@ -28,7 +28,6 @@
  */
 
 #include "tests.h"
-#include "netlink.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
@@ -36,6 +35,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
+#include "netlink.h"
 #include <linux/if_ether.h>
 #include <linux/inet_diag.h>
 #include <linux/netlink_diag.h>
@@ -48,10 +48,6 @@
 
 #define SMC_ACTIVE 1
 
-# if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-#  define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-# endif
-
 static void
 test_nlmsg_type(const int fd)
 {
diff --git a/tests/netlink_unix_diag.c b/tests/netlink_unix_diag.c
index 269adc6f..119cc9e7 100644
--- a/tests/netlink_unix_diag.c
+++ b/tests/netlink_unix_diag.c
@@ -36,14 +36,10 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/unix_diag.h>
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 static void
 send_query(const int fd)
 {
diff --git a/tests/netlink_xfrm.c b/tests/netlink_xfrm.c
index c7a34e59..27f62d1e 100644
--- a/tests/netlink_xfrm.c
+++ b/tests/netlink_xfrm.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/xfrm.h>
 
 static void
diff --git a/tests/nlattr.c b/tests/nlattr.c
index 946c2b4a..6bb14633 100644
--- a/tests/nlattr.c
+++ b/tests/nlattr.c
@@ -29,7 +29,6 @@
  */
 
 #include "tests.h"
-#include "netlink.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -37,14 +36,11 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
+#include "netlink.h"
 #include <linux/rtnetlink.h>
 #include <linux/sock_diag.h>
 #include <linux/unix_diag.h>
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 static void
 test_nlattr(const int fd)
 {