2 files changed, 6 insertions, 12 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index f072598c8d68..fe596c6ef353 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2455,13 +2455,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
 
         switch(sel->family) {
         case AF_INET:
-                audit_log_format(audit_buf, " src=" NIPQUAD_FMT,
-                                 NIPQUAD(sel->saddr.a4));
+                audit_log_format(audit_buf, " src=%pI4", &sel->saddr.a4);
                 if (sel->prefixlen_s != 32)
                         audit_log_format(audit_buf, " src_prefixlen=%d",
                                          sel->prefixlen_s);
-                audit_log_format(audit_buf, " dst=" NIPQUAD_FMT,
-                                 NIPQUAD(sel->daddr.a4));
+                audit_log_format(audit_buf, " dst=%pI4", &sel->daddr.a4);
                 if (sel->prefixlen_d != 32)
                         audit_log_format(audit_buf, " dst_prefixlen=%d",
                                          sel->prefixlen_d);
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 304eca4ac970..cd9d9171ded7 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2109,10 +2109,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
 
         switch(x->props.family) {
         case AF_INET:
-                audit_log_format(audit_buf,
-                                 " src=" NIPQUAD_FMT " dst=" NIPQUAD_FMT,
-                                 NIPQUAD(x->props.saddr.a4),
-                                 NIPQUAD(x->id.daddr.a4));
+                audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
+                                 &x->props.saddr.a4, &x->id.daddr.a4);
                 break;
         case AF_INET6:
                 audit_log_format(audit_buf, " src=%pI6 dst=%pI6",
@@ -2132,10 +2130,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
         switch (family) {
         case AF_INET:
                 iph4 = ip_hdr(skb);
-                audit_log_format(audit_buf,
-                                 " src=" NIPQUAD_FMT " dst=" NIPQUAD_FMT,
-                                 NIPQUAD(iph4->saddr),
-                                 NIPQUAD(iph4->daddr));
+                audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
+                                 &iph4->saddr, &iph4->daddr);
                 break;
         case AF_INET6:
                 iph6 = ipv6_hdr(skb);