diff options
Diffstat (limited to 'net/netlabel')
-rw-r--r-- | net/netlabel/netlabel_addrlist.c | 4 | ||||
-rw-r--r-- | net/netlabel/netlabel_mgmt.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c index 249f6b92f153..834c6eb7f484 100644 --- a/net/netlabel/netlabel_addrlist.c +++ b/net/netlabel/netlabel_addrlist.c | |||
@@ -337,7 +337,7 @@ void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf, | |||
337 | 337 | ||
338 | if (dev != NULL) | 338 | if (dev != NULL) |
339 | audit_log_format(audit_buf, " netif=%s", dev); | 339 | audit_log_format(audit_buf, " netif=%s", dev); |
340 | audit_log_format(audit_buf, " %s=" NIPQUAD_FMT, dir, NIPQUAD(addr)); | 340 | audit_log_format(audit_buf, " %s=%pI4", dir, &addr); |
341 | if (mask_val != 0xffffffff) { | 341 | if (mask_val != 0xffffffff) { |
342 | u32 mask_len = 0; | 342 | u32 mask_len = 0; |
343 | while (mask_val > 0) { | 343 | while (mask_val > 0) { |
@@ -371,7 +371,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf, | |||
371 | 371 | ||
372 | if (dev != NULL) | 372 | if (dev != NULL) |
373 | audit_log_format(audit_buf, " netif=%s", dev); | 373 | audit_log_format(audit_buf, " netif=%s", dev); |
374 | audit_log_format(audit_buf, " %s=" NIP6_FMT, dir, NIP6(*addr)); | 374 | audit_log_format(audit_buf, " %s=%pI6", dir, addr); |
375 | if (ntohl(mask->s6_addr32[3]) != 0xffffffff) { | 375 | if (ntohl(mask->s6_addr32[3]) != 0xffffffff) { |
376 | u32 mask_len = 0; | 376 | u32 mask_len = 0; |
377 | u32 mask_val; | 377 | u32 mask_val; |
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c index 0a0ef17b2a40..1821c5d50fb8 100644 --- a/net/netlabel/netlabel_mgmt.c +++ b/net/netlabel/netlabel_mgmt.c | |||
@@ -596,7 +596,6 @@ listdef_failure: | |||
596 | /** | 596 | /** |
597 | * netlbl_mgmt_protocols_cb - Write an individual PROTOCOL message response | 597 | * netlbl_mgmt_protocols_cb - Write an individual PROTOCOL message response |
598 | * @skb: the skb to write to | 598 | * @skb: the skb to write to |
599 | * @seq: the NETLINK sequence number | ||
600 | * @cb: the NETLINK callback | 599 | * @cb: the NETLINK callback |
601 | * @protocol: the NetLabel protocol to use in the message | 600 | * @protocol: the NetLabel protocol to use in the message |
602 | * | 601 | * |