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 87b35514e5e7beb35dbd243275fe15e2738f43de..8dc47fc782fd7068c8c518dd44eb6c87085af41b 100644 (file)
--- 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 0df4e8053edddd6055b5a025bff7f475417418ca..bfbe585b0013d2b39b8d6d491c2f0727a3754336 100644 (file)
--- 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 9b4904a28c160bb9e109d5fa9de34a227e4939cb..064960fa5947e47589d5ea51588b169c1819c52f 100644 (file)
--- 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 9dc9ecf5be4d2a4f1fa753b4a04137513b1bdf07..1d9bac3956e2b5abe3b2febda2be693f1e0ad66a 100644 (file)
--- 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 6539edabf619c6ed9ce685ff92467eced48f578d..8ccf5bc0550f7591a2f2caa3ca12d53f9102d561 100644 (file)
--- 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 c13feeac05543ae13ae0739ea702ec3cd7cf03bf..00ddc4f3ae9e03ed8b0f2324bb76d350bbe1a309 100644 (file)
--- 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 31f4f45e77df74c444316d9ae820ea6ecbe827c9..4f80c8b57e04945242534637ac4babbadcf90b2c 100644 (file)
--- 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 2332e203af0b49f7bfd6352d38e3cdfe3372ebb0..5f68cb3c99b5a2d3b59abda7892e21a4ebbd338a 100644 (file)
--- 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 0c64b108ff2fa74d7e9096014a0c7615a0f5a57d..2907c26124f09cf1a7f21f7b4a1237578de1bdd4 100644 (file)
--- 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 fc32822b178d4a0a5056a9113764f8014ad5a812..d7e83f5cef13dd088b60d952619151d3e8cba1b9 100644 (file)
--- 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 07e0210883b167f8a4ec7bdf522339ffe420b94b..d0479805ef456765c28d302f738bb491458c8800 100644 (file)
--- 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 71458d0f1c41385f54c429fb62815fea205762ad..54a54b7e73a9cd5aa2ef79380f114d75df5ae6d0 100644 (file)
--- 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 6a6652f8f04bfe1e7693f814f668c4db2b3db11b..6494fda99a7525aaadea5e24ba625d8dae8e7fce 100644 (file)
--- 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 86a4264398ea5e262ff16118fb96c362426bb4d5..b8d019040472dbc3dcfb34fea3572e4889220b45 100644 (file)
--- 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 269adc6f9d8c0caac28f9013c070e3b5c70986f6..119cc9e724a949694f5a9b5c4fefa72269c3c52f 100644 (file)
--- 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 c7a34e591fb9885cecf77ef8bf10bda34ad6428d..27f62d1ec8b22127c78eeded21b092337473fbe9 100644 (file)
--- 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 946c2b4ae29fabec7b777e8440206107e81e2277..6bb146337f4594d0767fa5657433a9ea4e9c1297 100644 (file)
--- 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)
 {