diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /security/selinux/avc.c | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'security/selinux/avc.c')
| -rw-r--r-- | security/selinux/avc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 74c0319c417e..e73ac1ab7cfd 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -496,7 +496,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab, | |||
| 496 | audit_log_format(ab, " %s=%d", name2, ntohs(port)); | 496 | audit_log_format(ab, " %s=%d", name2, ntohs(port)); |
| 497 | } | 497 | } |
| 498 | 498 | ||
| 499 | static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, | 499 | static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr, |
| 500 | __be16 port, char *name1, char *name2) | 500 | __be16 port, char *name1, char *name2) |
| 501 | { | 501 | { |
| 502 | if (addr) | 502 | if (addr) |