aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_state.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-28 19:10:17 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-29 02:02:32 -0400
commitfdb46ee752ed05c94bac71fe3decdb5175ec6e1f (patch)
tree903aa4ba2c7afc996e9ddd3304e64770db830f7d /net/xfrm/xfrm_state.c
parent0c6ce78abf6e228d44c3840edb8a4ae0c1299825 (diff)
net, misc: replace uses of NIP6_FMT with %p6
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.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 508337f97249..7944861fb9bf 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2115,10 +2115,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
2115 NIPQUAD(x->id.daddr.a4)); 2115 NIPQUAD(x->id.daddr.a4));
2116 break; 2116 break;
2117 case AF_INET6: 2117 case AF_INET6:
2118 audit_log_format(audit_buf, 2118 audit_log_format(audit_buf, " src=%p6 dst=%p6",
2119 " src=" NIP6_FMT " dst=" NIP6_FMT, 2119 x->props.saddr.a6, x->id.daddr.a6);
2120 NIP6(*(struct in6_addr *)x->props.saddr.a6),
2121 NIP6(*(struct in6_addr *)x->id.daddr.a6));
2122 break; 2120 break;
2123 } 2121 }
2124 2122
@@ -2142,10 +2140,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
2142 case AF_INET6: 2140 case AF_INET6:
2143 iph6 = ipv6_hdr(skb); 2141 iph6 = ipv6_hdr(skb);
2144 audit_log_format(audit_buf, 2142 audit_log_format(audit_buf,
2145 " src=" NIP6_FMT " dst=" NIP6_FMT 2143 " src=%p6 dst=%p6 flowlbl=0x%x%02x%02x",
2146 " flowlbl=0x%x%02x%02x", 2144 &iph6->saddr,&iph6->daddr,
2147 NIP6(iph6->saddr),
2148 NIP6(iph6->daddr),
2149 iph6->flow_lbl[0] & 0x0f, 2145 iph6->flow_lbl[0] & 0x0f,
2150 iph6->flow_lbl[1], 2146 iph6->flow_lbl[1],
2151 iph6->flow_lbl[2]); 2147 iph6->flow_lbl[2]);