diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /security/selinux/netlink.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/netlink.c')
| -rw-r--r-- | security/selinux/netlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c index 36ac257cec9a..161e01a6c7ef 100644 --- a/security/selinux/netlink.c +++ b/security/selinux/netlink.c | |||
| @@ -14,11 +14,14 @@ | |||
| 14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
| 15 | #include <linux/stddef.h> | 15 | #include <linux/stddef.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/export.h> | ||
| 17 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 18 | #include <linux/netlink.h> | 19 | #include <linux/netlink.h> |
| 19 | #include <linux/selinux_netlink.h> | 20 | #include <linux/selinux_netlink.h> |
| 20 | #include <net/net_namespace.h> | 21 | #include <net/net_namespace.h> |
| 21 | 22 | ||
| 23 | #include "security.h" | ||
| 24 | |||
| 22 | static struct sock *selnl; | 25 | static struct sock *selnl; |
| 23 | 26 | ||
| 24 | static int selnl_msglen(int msgtype) | 27 | static int selnl_msglen(int msgtype) |