diff options
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/ipv6.c | 18 | ||||
-rw-r--r-- | net/sctp/sm_statefuns.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index e82668bd2b50..ceaa4aa066ea 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -223,7 +223,7 @@ 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, src:%p6 dst:%p6\n", | 226 | SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n", |
227 | __func__, skb, skb->len, | 227 | __func__, skb, skb->len, |
228 | &fl.fl6_src, &fl.fl6_dst); | 228 | &fl.fl6_src, &fl.fl6_dst); |
229 | 229 | ||
@@ -251,18 +251,18 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc, | |||
251 | fl.oif = daddr->v6.sin6_scope_id; | 251 | fl.oif = daddr->v6.sin6_scope_id; |
252 | 252 | ||
253 | 253 | ||
254 | SCTP_DEBUG_PRINTK("%s: DST=%p6 ", __func__, &fl.fl6_dst); | 254 | SCTP_DEBUG_PRINTK("%s: DST=%pI6 ", __func__, &fl.fl6_dst); |
255 | 255 | ||
256 | if (saddr) { | 256 | if (saddr) { |
257 | ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); | 257 | ipv6_addr_copy(&fl.fl6_src, &saddr->v6.sin6_addr); |
258 | SCTP_DEBUG_PRINTK("SRC=%p6 - ", &fl.fl6_src); | 258 | SCTP_DEBUG_PRINTK("SRC=%pI6 - ", &fl.fl6_src); |
259 | } | 259 | } |
260 | 260 | ||
261 | dst = ip6_route_output(&init_net, NULL, &fl); | 261 | dst = ip6_route_output(&init_net, NULL, &fl); |
262 | if (!dst->error) { | 262 | if (!dst->error) { |
263 | struct rt6_info *rt; | 263 | struct rt6_info *rt; |
264 | rt = (struct rt6_info *)dst; | 264 | rt = (struct rt6_info *)dst; |
265 | SCTP_DEBUG_PRINTK("rt6_dst:%p6 rt6_src:%p6\n", | 265 | SCTP_DEBUG_PRINTK("rt6_dst:%pI6 rt6_src:%pI6\n", |
266 | &rt->rt6i_dst.addr, &rt->rt6i_src.addr); | 266 | &rt->rt6i_dst.addr, &rt->rt6i_src.addr); |
267 | return dst; | 267 | return dst; |
268 | } | 268 | } |
@@ -309,7 +309,7 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, | |||
309 | __u8 matchlen = 0; | 309 | __u8 matchlen = 0; |
310 | __u8 bmatchlen; | 310 | __u8 bmatchlen; |
311 | 311 | ||
312 | SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%p6 ", | 312 | SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%pI6 ", |
313 | __func__, asoc, dst, &daddr->v6.sin6_addr); | 313 | __func__, asoc, dst, &daddr->v6.sin6_addr); |
314 | 314 | ||
315 | if (!asoc) { | 315 | if (!asoc) { |
@@ -318,7 +318,7 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, | |||
318 | &daddr->v6.sin6_addr, | 318 | &daddr->v6.sin6_addr, |
319 | inet6_sk(&sk->inet.sk)->srcprefs, | 319 | inet6_sk(&sk->inet.sk)->srcprefs, |
320 | &saddr->v6.sin6_addr); | 320 | &saddr->v6.sin6_addr); |
321 | SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %p6\n", | 321 | SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: %pI6\n", |
322 | &saddr->v6.sin6_addr); | 322 | &saddr->v6.sin6_addr); |
323 | return; | 323 | return; |
324 | } | 324 | } |
@@ -347,10 +347,10 @@ static void sctp_v6_get_saddr(struct sctp_sock *sk, | |||
347 | 347 | ||
348 | if (baddr) { | 348 | if (baddr) { |
349 | memcpy(saddr, baddr, sizeof(union sctp_addr)); | 349 | memcpy(saddr, baddr, sizeof(union sctp_addr)); |
350 | SCTP_DEBUG_PRINTK("saddr: %p6\n", &saddr->v6.sin6_addr); | 350 | SCTP_DEBUG_PRINTK("saddr: %pI6\n", &saddr->v6.sin6_addr); |
351 | } else { | 351 | } else { |
352 | 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 " |
353 | "address for the dest:%p6\n", | 353 | "address for the dest:%pI6\n", |
354 | __func__, asoc, &daddr->v6.sin6_addr); | 354 | __func__, asoc, &daddr->v6.sin6_addr); |
355 | } | 355 | } |
356 | 356 | ||
@@ -720,7 +720,7 @@ static int sctp_v6_is_ce(const struct sk_buff *skb) | |||
720 | /* Dump the v6 addr to the seq file. */ | 720 | /* Dump the v6 addr to the seq file. */ |
721 | static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) | 721 | static void sctp_v6_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) |
722 | { | 722 | { |
723 | seq_printf(seq, "%p6 ", &addr->v6.sin6_addr); | 723 | seq_printf(seq, "%pI6 ", &addr->v6.sin6_addr); |
724 | } | 724 | } |
725 | 725 | ||
726 | static void sctp_v6_ecn_capable(struct sock *sk) | 726 | static void sctp_v6_ecn_capable(struct sock *sk) |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 9f370964e733..d07b484b873a 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
@@ -1123,7 +1123,7 @@ 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 %p6\n", | 1126 | "%s association %p could not find address %pI6\n", |
1127 | __func__, | 1127 | __func__, |
1128 | asoc, | 1128 | asoc, |
1129 | &from_addr.v6.sin6_addr); | 1129 | &from_addr.v6.sin6_addr); |