summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-08-22 17:12:50 +0200
committerDavid S. Miller <davem@davemloft.net>2013-08-22 22:07:06 -0700
commit05f147ef7c5289e9aba488b3e71a4259be5a1420 (patch)
tree8fa5427bb1ba1c8f7404d6754bfdd4d8a1228981
parent5b5fde7fdd39aeae627eb99be9bd80c18774a3bf (diff)
downloadop-kernel-dev-05f147ef7c5289e9aba488b3e71a4259be5a1420.zip
op-kernel-dev-05f147ef7c5289e9aba488b3e71a4259be5a1420.tar.gz
net: sctp_probe: simplify code by using %pISc format specifier
We can simply use the %pISc format specifier that was recently added and thus remove some code that distinguishes between IPv4 and IPv6. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/probe.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index e62c225..cd72ae5 100644
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -155,13 +155,8 @@ static sctp_disposition_t jsctp_sf_eat_sack(struct net *net,
if (sp == asoc->peer.primary_path)
printl("*");
- if (sp->ipaddr.sa.sa_family == AF_INET)
- printl("%pI4 ", &sp->ipaddr.v4.sin_addr);
- else
- printl("%pI6 ", &sp->ipaddr.v6.sin6_addr);
-
- printl("%2u %8u %8u %8u %8u %8u ",
- sp->state, sp->cwnd, sp->ssthresh,
+ printl("%pISc %2u %8u %8u %8u %8u %8u ",
+ &sp->ipaddr, sp->state, sp->cwnd, sp->ssthresh,
sp->flight_size, sp->partial_bytes_acked,
sp->pathmtu);
}
OpenPOWER on IntegriCloud