From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 4 Jun 2017 17:03:44 +0000 (+0000)
Subject: Move netlink_protocols definition from net.c to netlink.c
X-Git-Tag: v4.18~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c826fa0f71f93686fd463a66c5dee30ae097fc8c;p=strace

Move netlink_protocols definition from net.c to netlink.c

The side effect of #include "xlat/netlink_protocols.h" is
NETLINK_* constants properly defined in that header file.
While net.c does not use these constants itself, netlink.c
is going to need them soon.

* net.c: Move inclusion of "xlat/netlink_protocols.h" ...
* netlink.c: ... here.
---

diff --git a/net.c b/net.c
index 01ab16b5..434acd89 100644
--- a/net.c
+++ b/net.c
@@ -81,7 +81,6 @@
 #include "xlat/socketlayers.h"
 
 #include "xlat/inet_protocols.h"
-#include "xlat/netlink_protocols.h"
 
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 # include <bluetooth/bluetooth.h>
diff --git a/netlink.c b/netlink.c
index daaa745f..fd07caa3 100644
--- a/netlink.c
+++ b/netlink.c
@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include "xlat/netlink_flags.h"
+#include "xlat/netlink_protocols.h"
 #include "xlat/netlink_types.h"
 
 #undef NLMSG_HDRLEN