diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /security/selinux/include/avc.h | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/selinux/include/avc.h')
| -rw-r--r-- | security/selinux/include/avc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/include/avc.h b/security/selinux/include/avc.h index 960ef18ddc41..6ed10c3d3339 100644 --- a/security/selinux/include/avc.h +++ b/security/selinux/include/avc.h | |||
| @@ -54,12 +54,12 @@ struct avc_audit_data { | |||
| 54 | char *netif; | 54 | char *netif; |
| 55 | struct sock *sk; | 55 | struct sock *sk; |
| 56 | u16 family; | 56 | u16 family; |
| 57 | u16 dport; | 57 | __be16 dport; |
| 58 | u16 sport; | 58 | __be16 sport; |
| 59 | union { | 59 | union { |
| 60 | struct { | 60 | struct { |
| 61 | u32 daddr; | 61 | __be32 daddr; |
| 62 | u32 saddr; | 62 | __be32 saddr; |
| 63 | } v4; | 63 | } v4; |
| 64 | struct { | 64 | struct { |
| 65 | struct in6_addr daddr; | 65 | struct in6_addr daddr; |