summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Moore <paul.moore@hp.com>2006-08-29 17:56:04 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:18:39 -0700
commit7a0e1d602288370801c353221c6a938eab925053 (patch)
treef11ef396a27549513a91fcaf7d06dafb2b84509a
parente448e931309e703f51d71a557973c620ff12fbda (diff)
downloadlinux-stable-7a0e1d602288370801c353221c6a938eab925053.tar.gz
linux-stable-7a0e1d602288370801c353221c6a938eab925053.tar.bz2
linux-stable-7a0e1d602288370801c353221c6a938eab925053.zip
[NetLabel]: add some missing #includes to various header files
Add some missing include files to the NetLabel related header files. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/cipso_ipv4.h2
-rw-r--r--include/net/netlabel.h1
-rw-r--r--net/netlabel/netlabel_domainhash.h4
-rw-r--r--net/netlabel/netlabel_user.h5
-rw-r--r--security/selinux/include/selinux_netlabel.h9
5 files changed, 19 insertions, 2 deletions
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index 5aed72ab652b..59406e0dc5b2 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -37,6 +37,8 @@
#include <linux/types.h>
#include <linux/rcupdate.h>
#include <linux/list.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
#include <net/netlabel.h>
/* known doi values */
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 7cae730832c7..fc2b72fc7e07 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -31,6 +31,7 @@
#define _NETLABEL_H
#include <linux/types.h>
+#include <linux/net.h>
#include <linux/skbuff.h>
#include <net/netlink.h>
diff --git a/net/netlabel/netlabel_domainhash.h b/net/netlabel/netlabel_domainhash.h
index 9217863ce0d3..99a2287de246 100644
--- a/net/netlabel/netlabel_domainhash.h
+++ b/net/netlabel/netlabel_domainhash.h
@@ -32,6 +32,10 @@
#ifndef _NETLABEL_DOMAINHASH_H
#define _NETLABEL_DOMAINHASH_H
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+
/* Domain hash table size */
/* XXX - currently this number is an uneducated guess */
#define NETLBL_DOMHSH_BITSIZE 7
diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
index ccf237b3a128..385a6c7488c6 100644
--- a/net/netlabel/netlabel_user.h
+++ b/net/netlabel/netlabel_user.h
@@ -31,11 +31,12 @@
#ifndef _NETLABEL_USER_H
#define _NETLABEL_USER_H
+#include <linux/types.h>
#include <linux/skbuff.h>
#include <linux/capability.h>
-#include <linux/genetlink.h>
-#include <net/netlabel.h>
+#include <net/netlink.h>
#include <net/genetlink.h>
+#include <net/netlabel.h>
/* NetLabel NETLINK helper functions */
diff --git a/security/selinux/include/selinux_netlabel.h b/security/selinux/include/selinux_netlabel.h
index d69ec650cdbe..ecab4bddaaf4 100644
--- a/security/selinux/include/selinux_netlabel.h
+++ b/security/selinux/include/selinux_netlabel.h
@@ -27,6 +27,15 @@
#ifndef _SELINUX_NETLABEL_H_
#define _SELINUX_NETLABEL_H_
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+
+#include "avc.h"
+#include "objsec.h"
+
#ifdef CONFIG_NETLABEL
void selinux_netlbl_cache_invalidate(void);
int selinux_netlbl_socket_post_create(struct socket *sock,