History

Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

James Morris committed 10 years ago

Commit d011a4d2 parents 544e1ce 3f0935436 files · +3511 −259Browse files

Showing the changes to include/uapi/linux (2 of 36 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/audit.h +2 −0
  2. include/uapi/linux/in6.h +1 −0
include/uapi/linux/audit.h+2−0
@@ -130,6 +130,8 @@ · 129 unmodified lines
130130 #define AUDIT_MAC_IPSEC_EVENT 1415 /* Audit an IPSec event */
131131 #define AUDIT_MAC_UNLBL_STCADD 1416 /* NetLabel: add a static label */
132132 #define AUDIT_MAC_UNLBL_STCDEL 1417 /* NetLabel: del a static label */
133+#define AUDIT_MAC_CALIPSO_ADD 1418 /* NetLabel: add CALIPSO DOI entry */
134+#define AUDIT_MAC_CALIPSO_DEL 1419 /* NetLabel: del CALIPSO DOI entry */
133135
134136 #define AUDIT_FIRST_KERN_ANOM_MSG 1700
135137 #define AUDIT_LAST_KERN_ANOM_MSG 1799
include/uapi/linux/in6.h+1−0
@@ -143,6 +143,7 @@ struct in6_flowlabel_req { · 142 unmodified lines
143143 #define IPV6_TLV_PAD1 0
144144 #define IPV6_TLV_PADN 1
145145 #define IPV6_TLV_ROUTERALERT 5
146+#define IPV6_TLV_CALIPSO 7 /* RFC 5570 */
146147 #define IPV6_TLV_JUMBO 194
147148 #define IPV6_TLV_HAO 201 /* home address option */
148149

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t