[S390] dasd: fix idaw boundary checking for track based ccw

[safe/jmp/linux-2.6] / net / netlabel / netlabel_addrlist.c

diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
index 8b1c58b..834c6eb 100644 (file)
--- a/net/netlabel/netlabel_addrlist.c
+++ b/net/netlabel/netlabel_addrlist.c
@@ -315,6 +315,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const struct in6_addr *addr,
  * Audit Helper Functions
  */
 
+#ifdef CONFIG_AUDIT
 /**
  * netlbl_af4list_audit_addr - Audit an IPv4 address
  * @audit_buf: audit buffer
@@ -336,7 +337,7 @@ void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
 
        if (dev != NULL)
                audit_log_format(audit_buf, " netif=%s", dev);
-       audit_log_format(audit_buf, " %s=" NIPQUAD_FMT, dir, NIPQUAD(addr));
+       audit_log_format(audit_buf, " %s=%pI4", dir, &addr);
        if (mask_val != 0xffffffff) {
                u32 mask_len = 0;
                while (mask_val > 0) {
@@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
        }
 }
 #endif /* IPv6 */
+#endif /* CONFIG_AUDIT */