summaryrefslogtreecommitdiffstats
path: root/include/linux/audit.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-03 19:29:43 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-03 19:29:43 +0900
commitf94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch)
tree21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/linux/audit.h
parente27808df97ff7b43b4927aadf410705f33313523 (diff)
parent1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff)
downloadblackbird-obmc-linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.tar.gz
blackbird-obmc-linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.zip
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/audit.h')
-rw-r--r--include/linux/audit.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 359df0487690..9d339eb27881 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -103,6 +103,8 @@
#define AUDIT_BPRM_FCAPS 1321 /* Information about fcaps increasing perms */
#define AUDIT_CAPSET 1322 /* Record showing argument to sys_capset */
#define AUDIT_MMAP 1323 /* Record showing descriptor and flags in mmap */
+#define AUDIT_NETFILTER_PKT 1324 /* Packets traversing netfilter chains */
+#define AUDIT_NETFILTER_CFG 1325 /* Netfilter chain modifications */
#define AUDIT_AVC 1400 /* SE Linux avc denial or grant */
#define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */
OpenPOWER on IntegriCloud