Patchwork [net-next] net: sctp_probe: simplify code by using %pISc format specifier

login
register
mail settings
Submitter Daniel Borkmann
Date Aug. 22, 2013, 3:12 p.m.
Message ID <1377184370-13721-1-git-send-email-dborkman@redhat.com>
Download mbox | patch
Permalink /patch/269091/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Borkmann - Aug. 22, 2013, 3:12 p.m.
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>
---
 net/sctp/probe.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
Neil Horman - Aug. 22, 2013, 3:26 p.m.
On Thu, Aug 22, 2013 at 05:12:50PM +0200, Daniel Borkmann wrote:
> 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>
> ---
>  net/sctp/probe.c | 9 ++-------
>  1 file 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);
>  		}
> -- 
> 1.7.11.7
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
Acked-by: Neil Horman <nhorman@tuxdriver.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 23, 2013, 5:10 a.m.
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 22 Aug 2013 17:12:50 +0200

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);
 		}