diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:49:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-23 19:49:31 -0400 |
| commit | a4c12d6c5dde48c69464baf7c703e425ee511433 (patch) | |
| tree | 73c375e41a353e2da0461ff30d744bff73958b08 /security/selinux/include/av_permissions.h | |
| parent | 73af07de3e32b9ac328c3d1417258bb98a9b0a9b (diff) | |
| parent | 3b9f9a1c3903b64c38505f9fed3bb11e48dbc931 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
[IPV6] ADDRCONF: Mobile IPv6 Home Address support.
[IPV6] ADDRCONF: Allow non-DAD'able addresses.
[IPV6] NDISC: Fix is_router flag setting.
[IPV6] ADDRCONF: Convert addrconf_lock to RCU.
[IPV6] NDISC: Add proxy_ndp sysctl.
[IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
[IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
[IPV6]: Don't forward packets to proxied link-local address.
[IPV6] NDISC: Handle NDP messages to proxied addresses.
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak
[NETFILTER]: PPTP conntrack: fix GRE keymap leak
[NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
[NETFILTER]: PPTP conntrack: check call ID before changing state
[NETFILTER]: PPTP conntrack: clean up debugging cruft
[NETFILTER]: PPTP conntrack: consolidate header parsing
[NETFILTER]: PPTP conntrack: consolidate header size checks
[NETFILTER]: PPTP conntrack: simplify expectation handling
[NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
[NETFILTER]: PPTP conntrack: fix header definitions
[NETFILTER]: PPTP conntrack: remove more dead code
...
Diffstat (limited to 'security/selinux/include/av_permissions.h')
| -rw-r--r-- | security/selinux/include/av_permissions.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/include/av_permissions.h b/security/selinux/include/av_permissions.h index 69fd4b48202c..81f4f526c8b1 100644 --- a/security/selinux/include/av_permissions.h +++ b/security/selinux/include/av_permissions.h | |||
| @@ -911,6 +911,7 @@ | |||
| 911 | #define ASSOCIATION__SENDTO 0x00000001UL | 911 | #define ASSOCIATION__SENDTO 0x00000001UL |
| 912 | #define ASSOCIATION__RECVFROM 0x00000002UL | 912 | #define ASSOCIATION__RECVFROM 0x00000002UL |
| 913 | #define ASSOCIATION__SETCONTEXT 0x00000004UL | 913 | #define ASSOCIATION__SETCONTEXT 0x00000004UL |
| 914 | #define ASSOCIATION__POLMATCH 0x00000008UL | ||
| 914 | 915 | ||
| 915 | #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL | 916 | #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL |
| 916 | #define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL | 917 | #define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL |