aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-31 03:54:56 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-31 03:54:56 -0400
commit21454aaad30651ba0dcc16fe5271bc12ee21f132 (patch)
treeeb525494d6f80a0e855840bc588ae1f422348b04 /net/xfrm
parent14d5e834f6b36667c7da56374645f99b6cf30814 (diff)
net: replace NIPQUAD() in net/*/
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u can be replaced with %pI4 Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c6
-rw-r--r--net/xfrm/xfrm_state.c12
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,
2455 2455
2456 switch(sel->family) { 2456 switch(sel->family) {
2457 case AF_INET: 2457 case AF_INET:
2458 audit_log_format(audit_buf, " src=" NIPQUAD_FMT, 2458 audit_log_format(audit_buf, " src=%pI4", &sel->saddr.a4);
2459 NIPQUAD(sel->saddr.a4));
2460 if (sel->prefixlen_s != 32) 2459 if (sel->prefixlen_s != 32)
2461 audit_log_format(audit_buf, " src_prefixlen=%d", 2460 audit_log_format(audit_buf, " src_prefixlen=%d",
2462 sel->prefixlen_s); 2461 sel->prefixlen_s);
2463 audit_log_format(audit_buf, " dst=" NIPQUAD_FMT, 2462 audit_log_format(audit_buf, " dst=%pI4", &sel->daddr.a4);
2464 NIPQUAD(sel->daddr.a4));
2465 if (sel->prefixlen_d != 32) 2463 if (sel->prefixlen_d != 32)
2466 audit_log_format(audit_buf, " dst_prefixlen=%d", 2464 audit_log_format(audit_buf, " dst_prefixlen=%d",
2467 sel->prefixlen_d); 2465 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,
2109 2109
2110 switch(x->props.family) { 2110 switch(x->props.family) {
2111 case AF_INET: 2111 case AF_INET:
2112 audit_log_format(audit_buf, 2112 audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
2113 " src=" NIPQUAD_FMT " dst=" NIPQUAD_FMT, 2113 &x->props.saddr.a4, &x->id.daddr.a4);
2114 NIPQUAD(x->props.saddr.a4),
2115 NIPQUAD(x->id.daddr.a4));
2116 break; 2114 break;
2117 case AF_INET6: 2115 case AF_INET6:
2118 audit_log_format(audit_buf, " src=%pI6 dst=%pI6", 2116 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,
2132 switch (family) { 2130 switch (family) {
2133 case AF_INET: 2131 case AF_INET:
2134 iph4 = ip_hdr(skb); 2132 iph4 = ip_hdr(skb);
2135 audit_log_format(audit_buf, 2133 audit_log_format(audit_buf, " src=%pI4 dst=%pI4",
2136 " src=" NIPQUAD_FMT " dst=" NIPQUAD_FMT, 2134 &iph4->saddr, &iph4->daddr);
2137 NIPQUAD(iph4->saddr),
2138 NIPQUAD(iph4->daddr));
2139 break; 2135 break;
2140 case AF_INET6: 2136 case AF_INET6:
2141 iph6 = ipv6_hdr(skb); 2137 iph6 = ipv6_hdr(skb);