aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--net/netlabel/netlabel_addrlist.c2
-rw-r--r--net/sctp/ipv6.c35
-rw-r--r--net/sctp/sm_statefuns.c5
-rw-r--r--net/sunrpc/clnt.c4
-rw-r--r--net/sunrpc/rpcb_clnt.c6
-rw-r--r--net/sunrpc/svcauth_unix.c5
-rw-r--r--net/sunrpc/xprtsock.c19
-rw-r--r--net/xfrm/xfrm_policy.c6
-rw-r--r--net/xfrm/xfrm_state.c12
9 files changed, 39 insertions, 55 deletions
diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
index b0925a303353..614c95ec39df 100644
--- a/net/netlabel/netlabel_addrlist.c
+++ b/net/netlabel/netlabel_addrlist.c
@@ -370,7 +370,7 @@ void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
370 370
371 if (dev != NULL) 371 if (dev != NULL)
372 audit_log_format(audit_buf, " netif=%s", dev); 372 audit_log_format(audit_buf, " netif=%s", dev);
373 audit_log_format(audit_buf, " %s=" NIP6_FMT, dir, NIP6(*addr)); 373 audit_log_format(audit_buf, " %s=%p6", dir, addr);
374 if (ntohl(mask->s6_addr32[3]) != 0xffffffff) { 374 if (ntohl(mask->s6_addr32[3]) != 0xffffffff) {
375 u32 mask_len = 0; 375 u32 mask_len = 0;
376 u32 mask_val; 376 u32 mask_val;
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 4124bbb99947..e82668bd2b50 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -223,10 +223,9 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)
223 ipv6_addr_copy(&fl.fl6_dst, rt0->addr); 223 ipv6_addr_copy(&fl.fl6_dst, rt0->addr);
224 } 224 }
225 225
226 SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, " 226 SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%p6 dst:%p6\n",
227 "src:" NIP6_FMT " dst:" NIP6_FMT "\n",
228 __func__, skb, skb->len, 227 __func__, skb, skb->len,
229 NIP6(fl.fl6_src), NIP6(fl.fl6_dst)); 228 &fl.fl6_src, &fl.fl6_dst);
230 229
231 SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS); 230 SCTP_INC_STATS(SCTP_MIB_OUTSCTPPACKS);
232 231
@@ -252,23 +251,19 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
252 fl.oif = daddr->v6.sin6_scope_id; 251 fl.oif = daddr->v6.sin6_scope_id;
253 252
254 253
255 SCTP_DEBUG_PRINTK("%s: DST=" NIP6_FMT " ", 254 SCTP_DEBUG_PRINTK("%s: DST=%p6 ", __func__, &fl.fl6_dst);
256 __func__, NIP6(fl.fl6_dst));
257 255
258 if (saddr) { 256 if (saddr) {
259 ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); 257 ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr);
260 SCTP_DEBUG_PRINTK( 258 SCTP_DEBUG_PRINTK("SRC=%p6 - ", &fl.fl6_src);
261 "SRC=" NIP6_FMT " - ",
262 NIP6(fl.fl6_src));
263 } 259 }
264 260
265 dst = ip6_route_output(&init_net, NULL, &fl); 261 dst = ip6_route_output(&init_net, NULL, &fl);
266 if (!dst->error) { 262 if (!dst->error) {
267 struct rt6_info *rt; 263 struct rt6_info *rt;
268 rt = (struct rt6_info *)dst; 264 rt = (struct rt6_info *)dst;
269 SCTP_DEBUG_PRINTK( 265 SCTP_DEBUG_PRINTK("rt6_dst:%p6 rt6_src:%p6\n",
270 "rt6_dst:" NIP6_FMT " rt6_src:" NIP6_FMT "\n", 266 &rt->rt6i_dst.addr, &rt->rt6i_src.addr);
271 NIP6(rt->rt6i_dst.addr), NIP6(rt->rt6i_src.addr));
272 return dst; 267 return dst;
273 } 268 }
274 SCTP_DEBUG_PRINTK("NO ROUTE\n"); 269 SCTP_DEBUG_PRINTK("NO ROUTE\n");
@@ -314,9 +309,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
314 __u8 matchlen = 0; 309 __u8 matchlen = 0;
315 __u8 bmatchlen; 310 __u8 bmatchlen;
316 311
317 SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p " 312 SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%p6 ",
318 "daddr:" NIP6_FMT " ", 313 __func__, asoc, dst, &daddr->v6.sin6_addr);
319 __func__, asoc, dst, NIP6(daddr->v6.sin6_addr));
320 314
321 if (!asoc) { 315 if (!asoc) {
322 ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)), 316 ipv6_dev_get_saddr(sock_net(sctp_opt2sk(sk)),
@@ -324,8 +318,8 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
324 &daddr->v6.sin6_addr, 318 &daddr->v6.sin6_addr,
325 inet6_sk(&sk->inet.sk)->srcprefs, 319 inet6_sk(&sk->inet.sk)->srcprefs,
326 &saddr->v6.sin6_addr); 320 &saddr->v6.sin6_addr);
327 SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n", 321 SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %p6\n",
328 NIP6(saddr->v6.sin6_addr)); 322 &saddr->v6.sin6_addr);
329 return; 323 return;
330 } 324 }
331 325
@@ -353,12 +347,11 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk,
353 347
354 if (baddr) { 348 if (baddr) {
355 memcpy(saddr, baddr, sizeof(union sctp_addr)); 349 memcpy(saddr, baddr, sizeof(union sctp_addr));
356 SCTP_DEBUG_PRINTK("saddr: " NIP6_FMT "\n", 350 SCTP_DEBUG_PRINTK("saddr: %p6\n", &saddr->v6.sin6_addr);
357 NIP6(saddr->v6.sin6_addr));
358 } else { 351 } else {
359 printk(KERN_ERR "%s: asoc:%p Could not find a valid source " 352 printk(KERN_ERR "%s: asoc:%p Could not find a valid source "
360 "address for the dest:" NIP6_FMT "\n", 353 "address for the dest:%p6\n",
361 __func__, asoc, NIP6(daddr->v6.sin6_addr)); 354 __func__, asoc, &daddr->v6.sin6_addr);
362 } 355 }
363 356
364 rcu_read_unlock(); 357 rcu_read_unlock();
@@ -727,7 +720,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb)
727/* Dump the v6 addr to the seq file. */ 720/* Dump the v6 addr to the seq file. */
728static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) 721static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr)
729{ 722{
730 seq_printf(seq, NIP6_FMT " ", NIP6(addr->v6.sin6_addr)); 723 seq_printf(seq, "%p6 ", &addr->v6.sin6_addr);
731} 724}
732 725
733static void sctp_v6_ecn_capable(struct sock *sk) 726static void sctp_v6_ecn_capable(struct sock *sk)
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index a6a0ea71ae93..9f370964e733 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -1123,11 +1123,10 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
1123 if (from_addr.sa.sa_family == AF_INET6) { 1123 if (from_addr.sa.sa_family == AF_INET6) {
1124 if (net_ratelimit()) 1124 if (net_ratelimit())
1125 printk(KERN_WARNING 1125 printk(KERN_WARNING
1126 "%s association %p could not find address " 1126 "%s association %p could not find address %p6\n",
1127 NIP6_FMT "\n",
1128 __func__, 1127 __func__,
1129 asoc, 1128 asoc,
1130 NIP6(from_addr.v6.sin6_addr)); 1129 &from_addr.v6.sin6_addr);
1131 } else { 1130 } else {
1132 if (net_ratelimit()) 1131 if (net_ratelimit())
1133 printk(KERN_WARNING 1132 printk(KERN_WARNING
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4895c341e46d..26f61fd11eab 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -278,8 +278,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
278 case AF_INET6: { 278 case AF_INET6: {
279 struct sockaddr_in6 *sin = 279 struct sockaddr_in6 *sin =
280 (struct sockaddr_in6 *)args->address; 280 (struct sockaddr_in6 *)args->address;
281 snprintf(servername, sizeof(servername), NIP6_FMT, 281 snprintf(servername, sizeof(servername), "%p6",
282 NIP6(sin->sin6_addr)); 282 &sin->sin6_addr);
283 break; 283 break;
284 } 284 }
285 default: 285 default:
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 41013dd66ac3..968ec1f66bc3 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -305,9 +305,9 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
305 snprintf(buf, sizeof(buf), "::.%u.%u", 305 snprintf(buf, sizeof(buf), "::.%u.%u",
306 port >> 8, port & 0xff); 306 port >> 8, port & 0xff);
307 else 307 else
308 snprintf(buf, sizeof(buf), NIP6_FMT".%u.%u", 308 snprintf(buf, sizeof(buf), "%p6.%u.%u",
309 NIP6(address_to_register->sin6_addr), 309 &address_to_register->sin6_addr,
310 port >> 8, port & 0xff); 310 port >> 8, port & 0xff);
311 map->r_addr = buf; 311 map->r_addr = buf;
312 312
313 dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with " 313 dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with "
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index f24800f2c098..9a6d0cfd4ce3 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd,
168 ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff, 168 ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff,
169 ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff); 169 ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff);
170 } else { 170 } else {
171 snprintf(text_addr, 40, NIP6_FMT, NIP6(im->m_addr)); 171 snprintf(text_addr, 40, "%p6", &im->m_addr);
172 } 172 }
173 qword_add(bpp, blen, im->m_class); 173 qword_add(bpp, blen, im->m_class);
174 qword_add(bpp, blen, text_addr); 174 qword_add(bpp, blen, text_addr);
@@ -286,8 +286,7 @@ static int ip_map_show(struct seq_file *m,
286 ntohl(addr.s6_addr32[3]) >> 0 & 0xff, 286 ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
287 dom); 287 dom);
288 } else { 288 } else {
289 seq_printf(m, "%s " NIP6_FMT " %s\n", 289 seq_printf(m, "%s %p6 %s\n", im->m_class, &addr, dom);
290 im->m_class, NIP6(addr), dom);
291 } 290 }
292 return 0; 291 return 0;
293} 292}
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 59155aebd3b9..349852238957 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -341,8 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
341 341
342 buf = kzalloc(40, GFP_KERNEL); 342 buf = kzalloc(40, GFP_KERNEL);
343 if (buf) { 343 if (buf) {
344 snprintf(buf, 40, NIP6_FMT, 344 snprintf(buf, 40, "%p6",&addr->sin6_addr);
345 NIP6(addr->sin6_addr));
346 } 345 }
347 xprt->address_strings[RPC_DISPLAY_ADDR] = buf; 346 xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
348 347
@@ -357,8 +356,8 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
357 356
358 buf = kzalloc(64, GFP_KERNEL); 357 buf = kzalloc(64, GFP_KERNEL);
359 if (buf) { 358 if (buf) {
360 snprintf(buf, 64, "addr="NIP6_FMT" port=%u proto=%s", 359 snprintf(buf, 64, "addr=%p6 port=%u proto=%s",
361 NIP6(addr->sin6_addr), 360 &addr->sin6_addr,
362 ntohs(addr->sin6_port), 361 ntohs(addr->sin6_port),
363 protocol); 362 protocol);
364 } 363 }
@@ -379,10 +378,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
379 378
380 buf = kzalloc(50, GFP_KERNEL); 379 buf = kzalloc(50, GFP_KERNEL);
381 if (buf) { 380 if (buf) {
382 snprintf(buf, 50, NIP6_FMT".%u.%u", 381 snprintf(buf, 50, "%p6.%u.%u",
383 NIP6(addr->sin6_addr), 382 &addr->sin6_addr,
384 ntohs(addr->sin6_port) >> 8, 383 ntohs(addr->sin6_port) >> 8,
385 ntohs(addr->sin6_port) & 0xff); 384 ntohs(addr->sin6_port) & 0xff);
386 } 385 }
387 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf; 386 xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
388 387
@@ -1408,8 +1407,8 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
1408 if (port > last) 1407 if (port > last)
1409 nloop++; 1408 nloop++;
1410 } while (err == -EADDRINUSE && nloop != 2); 1409 } while (err == -EADDRINUSE && nloop != 2);
1411 dprintk("RPC: xs_bind6 "NIP6_FMT":%u: %s (%d)\n", 1410 dprintk("RPC: xs_bind6 %p6:%u: %s (%d)\n",
1412 NIP6(myaddr.sin6_addr), port, err ? "failed" : "ok", err); 1411 &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
1413 return err; 1412 return err;
1414} 1413}
1415 1414
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 832b47c1de80..f052b069f983 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2467,13 +2467,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
2467 sel->prefixlen_d); 2467 sel->prefixlen_d);
2468 break; 2468 break;
2469 case AF_INET6: 2469 case AF_INET6:
2470 audit_log_format(audit_buf, " src=" NIP6_FMT, 2470 audit_log_format(audit_buf, " src=%p6", sel->saddr.a6);
2471 NIP6(*(struct in6_addr *)sel->saddr.a6));
2472 if (sel->prefixlen_s != 128) 2471 if (sel->prefixlen_s != 128)
2473 audit_log_format(audit_buf, " src_prefixlen=%d", 2472 audit_log_format(audit_buf, " src_prefixlen=%d",
2474 sel->prefixlen_s); 2473 sel->prefixlen_s);
2475 audit_log_format(audit_buf, " dst=" NIP6_FMT, 2474 audit_log_format(audit_buf, " dst=%p6", sel->daddr.a6);
2476 NIP6(*(struct in6_addr *)sel->daddr.a6));
2477 if (sel->prefixlen_d != 128) 2475 if (sel->prefixlen_d != 128)
2478 audit_log_format(audit_buf, " dst_prefixlen=%d", 2476 audit_log_format(audit_buf, " dst_prefixlen=%d",
2479 sel->prefixlen_d); 2477 sel->prefixlen_d);
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]);