diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:54:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:54:56 -0400 |
commit | 21454aaad30651ba0dcc16fe5271bc12ee21f132 (patch) | |
tree | eb525494d6f80a0e855840bc588ae1f422348b04 /net/xfrm/xfrm_state.c | |
parent | 14d5e834f6b36667c7da56374645f99b6cf30814 (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/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 12 |
1 files changed, 4 insertions, 8 deletions
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); |