diff options
Diffstat (limited to 'net/sctp/protocol.c')
-rw-r--r-- | net/sctp/protocol.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 0b65354aaf64..a8ca743241ee 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -482,9 +482,8 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc, | |||
482 | if (saddr) | 482 | if (saddr) |
483 | fl.fl4_src = saddr->v4.sin_addr.s_addr; | 483 | fl.fl4_src = saddr->v4.sin_addr.s_addr; |
484 | 484 | ||
485 | SCTP_DEBUG_PRINTK("%s: DST:%u.%u.%u.%u, SRC:%u.%u.%u.%u - ", | 485 | SCTP_DEBUG_PRINTK("%s: DST:%pI4, SRC:%pI4 - ", |
486 | __func__, NIPQUAD(fl.fl4_dst), | 486 | __func__, &fl.fl4_dst, &fl.fl4_src); |
487 | NIPQUAD(fl.fl4_src)); | ||
488 | 487 | ||
489 | if (!ip_route_output_key(&init_net, &rt, &fl)) { | 488 | if (!ip_route_output_key(&init_net, &rt, &fl)) { |
490 | dst = &rt->u.dst; | 489 | dst = &rt->u.dst; |
@@ -540,8 +539,8 @@ out_unlock: | |||
540 | rcu_read_unlock(); | 539 | rcu_read_unlock(); |
541 | out: | 540 | out: |
542 | if (dst) | 541 | if (dst) |
543 | SCTP_DEBUG_PRINTK("rt_dst:%u.%u.%u.%u, rt_src:%u.%u.%u.%u\n", | 542 | SCTP_DEBUG_PRINTK("rt_dst:%pI4, rt_src:%pI4\n", |
544 | NIPQUAD(rt->rt_dst), NIPQUAD(rt->rt_src)); | 543 | &rt->rt_dst, &rt->rt_src); |
545 | else | 544 | else |
546 | SCTP_DEBUG_PRINTK("NO ROUTE\n"); | 545 | SCTP_DEBUG_PRINTK("NO ROUTE\n"); |
547 | 546 | ||
@@ -646,7 +645,7 @@ static void sctp_v4_addr_v4map(struct sctp_sock *sp, union sctp_addr *addr) | |||
646 | /* Dump the v4 addr to the seq file. */ | 645 | /* Dump the v4 addr to the seq file. */ |
647 | static void sctp_v4_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) | 646 | static void sctp_v4_seq_dump_addr(struct seq_file *seq, union sctp_addr *addr) |
648 | { | 647 | { |
649 | seq_printf(seq, "%d.%d.%d.%d ", NIPQUAD(addr->v4.sin_addr)); | 648 | seq_printf(seq, "%pI4 ", &addr->v4.sin_addr); |
650 | } | 649 | } |
651 | 650 | ||
652 | static void sctp_v4_ecn_capable(struct sock *sk) | 651 | static void sctp_v4_ecn_capable(struct sock *sk) |
@@ -866,11 +865,10 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, | |||
866 | { | 865 | { |
867 | struct inet_sock *inet = inet_sk(skb->sk); | 866 | struct inet_sock *inet = inet_sk(skb->sk); |
868 | 867 | ||
869 | SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, " | 868 | SCTP_DEBUG_PRINTK("%s: skb:%p, len:%d, src:%pI4, dst:%pI4\n", |
870 | "src:%u.%u.%u.%u, dst:%u.%u.%u.%u\n", | ||
871 | __func__, skb, skb->len, | 869 | __func__, skb, skb->len, |
872 | NIPQUAD(skb->rtable->rt_src), | 870 | &skb->rtable->rt_src, |
873 | NIPQUAD(skb->rtable->rt_dst)); | 871 | &skb->rtable->rt_dst); |
874 | 872 | ||
875 | inet->pmtudisc = transport->param_flags & SPP_PMTUD_ENABLE ? | 873 | inet->pmtudisc = transport->param_flags & SPP_PMTUD_ENABLE ? |
876 | IP_PMTUDISC_DO : IP_PMTUDISC_DONT; | 874 | IP_PMTUDISC_DO : IP_PMTUDISC_DONT; |