include: merge branch 'include-cleanup'

Author: thom311

include/netlink-private/types.h

@@ -23,9 +23,13 @@
 #include <netlink-private/object-api.h>
 #include <netlink-private/route/tc-api.h>
 #include <netlink-private/route/link/sriov.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/genetlink.h>
 #include <linux/tc_act/tc_mirred.h>
 #include <linux/tc_act/tc_skbedit.h>
 #include <linux/tc_act/tc_gact.h>
+#include <linux/sock_diag.h>
 
 #define NL_SOCK_PASSCRED	(1<<1)
 #define NL_OWN_PORT		(1<<2)

include/netlink/addr.h

@@ -18,6 +18,8 @@
 extern "C" {
 #endif
 
+struct nlattr;
+
 struct nl_addr;
 
 /* Creation */

include/netlink/attr.h

@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+struct nlattr;
+
 struct nl_msg;
 
 /**

include/netlink/data.h

@@ -18,6 +18,8 @@
 extern "C" {
 #endif
 
+struct nlattr;
+
 struct nl_data;
 
 /* General */

include/netlink/handlers.h

@@ -22,10 +22,13 @@
 extern "C" {
 #endif
 
+struct nlmsgerr;
+struct sockaddr_nl;
+struct ucred;
+
 struct nl_cb;
 struct nl_sock;
 struct nl_msg;
-struct ucred;
 
 /**
  * @name Callback Typedefs

include/netlink/idiag/idiagnl.h

@@ -90,15 +90,15 @@ enum {
 
 
 /* deprectated keep these only for compatibility, DO NOT USE THEM */
-#define	IDIAG_SK_MEMINFO_RMEM_ALLOC SK_MEMINFO_RMEM_ALLOC
-#define	IDIAG_SK_MEMINFO_RCVBUF SK_MEMINFO_RCVBUF
-#define	IDIAG_SK_MEMINFO_WMEM_ALLOC SK_MEMINFO_WMEM_ALLOC
-#define	IDIAG_SK_MEMINFO_SNDBUF SK_MEMINFO_SNDBUF
-#define	IDIAG_SK_MEMINFO_FWD_ALLOC SK_MEMINFO_FWD_ALLOC
-#define	IDIAG_SK_MEMINFO_WMEM_QUEUED SK_MEMINFO_WMEM_QUEUED
-#define	IDIAG_SK_MEMINFO_OPTMEM SK_MEMINFO_OPTMEM
-#define	IDIAG_SK_MEMINFO_BACKLOG SK_MEMINFO_BACKLOG
-#define	IDIAG_SK_MEMINFO_VARS SK_MEMINFO_VARS
+#define IDIAG_SK_MEMINFO_RMEM_ALLOC                      0  /* SK_MEMINFO_RMEM_ALLOC */
+#define IDIAG_SK_MEMINFO_RCVBUF                          1  /* SK_MEMINFO_RCVBUF */
+#define IDIAG_SK_MEMINFO_WMEM_ALLOC                      2  /* SK_MEMINFO_WMEM_ALLOC */
+#define IDIAG_SK_MEMINFO_SNDBUF                          3  /* SK_MEMINFO_SNDBUF */
+#define IDIAG_SK_MEMINFO_FWD_ALLOC                       4  /* SK_MEMINFO_FWD_ALLOC */
+#define IDIAG_SK_MEMINFO_WMEM_QUEUED                     5  /* SK_MEMINFO_WMEM_QUEUED */
+#define IDIAG_SK_MEMINFO_OPTMEM                          6  /* SK_MEMINFO_OPTMEM */
+#define IDIAG_SK_MEMINFO_BACKLOG                         7  /* SK_MEMINFO_BACKLOG */
+#define IDIAG_SK_MEMINFO_VARS              SK_MEMINFO_VARS
 
 /* deprecated names. */
 #define IDIAG_TIMER_OFF                 IDIAGNL_TIMER_OFF

include/netlink/msg.h

@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+struct nlmsghdr;
+
 #define NL_DONTPAD	0
 
 /**

include/netlink/netlink.h

@@ -38,6 +38,7 @@
 extern "C" {
 #endif
 
+struct nlmsghdr;
 struct ucred;
 struct nl_cache_ops;
 struct nl_parser_param;

include/netlink/route/cls/ematch/cmp.h

@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+struct tcf_em_cmp;
+
 extern void	rtnl_ematch_cmp_set(struct rtnl_ematch *,
 				    struct tcf_em_cmp *);
 extern struct tcf_em_cmp *

include/netlink/route/link/can.h

@@ -20,6 +20,10 @@
 extern "C" {
 #endif
 
+struct can_bittiming_const;
+struct can_bittiming;
+struct can_berr_counter;
+
 extern int rtnl_link_is_can(struct rtnl_link *link);
 
 extern char *rtnl_link_can_ctrlmode2str(int, char *, size_t);