From patchwork Fri May 8 20:28:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 470178 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2846D1406AA for ; Sat, 9 May 2015 06:28:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=itxpIBk/; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932537AbbEHU2n (ORCPT ); Fri, 8 May 2015 16:28:43 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:34341 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261AbbEHU2m (ORCPT ); Fri, 8 May 2015 16:28:42 -0400 Received: by iedfl3 with SMTP id fl3so80850493ied.1 for ; Fri, 08 May 2015 13:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=5oRJy2smjxTzYMHniw9+vKxcgZOn/MuaJAzkhGfCx6Y=; b=itxpIBk/Levzm7KelDm2a6FKY4TCQ3nBE5P6hs9o21lnkd1idIIjvLP+YYr+e34okh CFBEfqhwWfHDLyt2zr7RCIAykmHrjWVtc0CWOQqjpVOcgHnSDhNePfnbR4FUQblvRmvL lJN49yMayFtUUv1hvWCclSM2ez1/Ra9IciJHvMp0G0hAVYDPzMSJc9GR/V/HCOdQE0gs n//MawRnOnH0SWbqkF9LCg4fMVaIgjgDXFjXsqFBc83sssp17O0GJKqstiyEYsE8QGfb fBpusNuABCJftClfP9KXOrbxCAA3WQ3RrRgthnNub2mHRtliIWf0DPjEGVyT0n2+JIQE xVAw== X-Received: by 10.50.57.51 with SMTP id f19mr1222755igq.6.1431116921622; Fri, 08 May 2015 13:28:41 -0700 (PDT) Received: from ?IPv6:2620:0:1000:3e02:3d7e:ef39:fda4:89f3? ([2620:0:1000:3e02:3d7e:ef39:fda4:89f3]) by mx.google.com with ESMTPSA id n9sm204897igv.13.2015.05.08.13.28.40 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 08 May 2015 13:28:41 -0700 (PDT) Message-ID: <1431116920.22756.18.camel@edumazet-glaptop2.roam.corp.google.com> Subject: [PATCH iproute2] ss: dctcp changes From: Eric Dumazet To: Stephen Hemminger Cc: netdev Date: Fri, 08 May 2015 13:28:40 -0700 X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eric Dumazet Missing space before dctcp: markers. With dctcp, cwnd=2 is pretty common, just display cwnd value even if cwnd has this value, it makes parsing easier. Signed-off-by: Eric Dumazet Acked-by: Daniel Borkmann --- -- 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 diff --git a/misc/ss.c b/misc/ss.c index 46dbb39..18ac105 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1684,7 +1684,7 @@ static void tcp_stats_print(struct tcpstat *s) if (s->mss) printf(" mss:%d", s->mss); - if (s->cwnd && s->cwnd != 2) + if (s->cwnd) printf(" cwnd:%d", s->cwnd); if (s->ssthresh) printf(" ssthresh:%d", s->ssthresh); @@ -1692,11 +1692,11 @@ static void tcp_stats_print(struct tcpstat *s) if (s->dctcp && s->dctcp->enabled) { struct dctcpstat *dctcp = s->dctcp; - printf("dctcp:(ce_state:%u,alpha:%u,ab_ecn:%u,ab_tot:%u)", + printf(" dctcp:(ce_state:%u,alpha:%u,ab_ecn:%u,ab_tot:%u)", dctcp->ce_state, dctcp->alpha, dctcp->ab_ecn, dctcp->ab_tot); } else if (s->dctcp) { - printf("dctcp:fallback_mode"); + printf(" dctcp:fallback_mode"); } if (s->send_bps)