diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
| commit | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch) | |
| tree | 1ff8dfe7d486f5648e69ee85e54cde1987d8296a /include/uapi/linux | |
| parent | 544e1cea03e6674e3c12a3b8e8cc507c3dbeaf0c (diff) | |
| parent | 3f09354ac84c6904787189d85fb306bf60f714b8 (diff) | |
| download | op-kernel-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip op-kernel-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.gz | |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/audit.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/in6.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index d820aa9..82e8aa5 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -130,6 +130,8 @@ #define AUDIT_MAC_IPSEC_EVENT 1415 /* Audit an IPSec event */ #define AUDIT_MAC_UNLBL_STCADD 1416 /* NetLabel: add a static label */ #define AUDIT_MAC_UNLBL_STCDEL 1417 /* NetLabel: del a static label */ +#define AUDIT_MAC_CALIPSO_ADD 1418 /* NetLabel: add CALIPSO DOI entry */ +#define AUDIT_MAC_CALIPSO_DEL 1419 /* NetLabel: del CALIPSO DOI entry */ #define AUDIT_FIRST_KERN_ANOM_MSG 1700 #define AUDIT_LAST_KERN_ANOM_MSG 1799 diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 318a482..b39ea4f 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -143,6 +143,7 @@ struct in6_flowlabel_req { #define IPV6_TLV_PAD1 0 #define IPV6_TLV_PADN 1 #define IPV6_TLV_ROUTERALERT 5 +#define IPV6_TLV_CALIPSO 7 /* RFC 5570 */ #define IPV6_TLV_JUMBO 194 #define IPV6_TLV_HAO 201 /* home address option */ |
