From patchwork Wed Jul 19 02:02:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 790706 X-Patchwork-Delegate: linville@tuxdriver.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="iPSBFeKB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xC0fm1NSkz9t1t for ; Wed, 19 Jul 2017 12:02:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbdGSCCv (ORCPT ); Tue, 18 Jul 2017 22:02:51 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:33877 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969AbdGSCCu (ORCPT ); Tue, 18 Jul 2017 22:02:50 -0400 Received: by mail-pg0-f41.google.com with SMTP id 123so22274017pgj.1 for ; Tue, 18 Jul 2017 19:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JR7DRBrAKsQ1aEOr8GkS6aMjcFJ3A08T1kc5ZOp6YjY=; b=iPSBFeKBtAfLS4+1hidCAiuAR7kMVqbzJHQwaosIoTwFIIYtrwnTOf5YEN+tmXoL5u SSW6C764NX6+CQn07mG/V7Xl0jBRauPLULK3h0uKEuQ5I3L1UvY4WQjL9htHbTytUF3s /gIrqb1A/Us9RagPYSjCwpftZ5GuTwaedAm7s3Zxqf9erL39F5kBhYPZJVtoa6r9bIPU 8yfv1NT8QnDWtKAUT+2bgUyaJUSOMKHzDih3ZEhMpxyD5JP5C3xLXUegfeg6DQ6dJ5OF mqgJhyKS0j5aDy1f5PYSCD7/fr8n6DoxVRIxpxDB2fH19sGaQi10ziqCWeB5OEsIc0hr Wnxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JR7DRBrAKsQ1aEOr8GkS6aMjcFJ3A08T1kc5ZOp6YjY=; b=MXvhD1UKhy14AfdSvM6KXJEi4HXkGkhQocY/N0W3xUgYPikn3EDQmWbGmOzUg6nfb8 wY1fbIMwk+J2Zw791DIVNf7kS34kMZDRkAHP6aiFXgf185aM1garhTBirqOSCgBsEUi3 TkD9b7hNUm5l5AcdWEMt7jBgW3EWvNk7wsRf0gXq3WCoPJpZ6PxQs4NXAFb+H3kKBLQ+ cEJcrZp0w4aFF5x1kr7QzFbhMGKCif+B1+uCMtqKahziAi36D7Dc7CrJWmsnN/lbYVah htbfIkug4AS+ztHoTzYULW9XUsQ1IzZuMwJLTtw5BqfVAs66HAVTzxg5E2SEcVxUMgGM A32g== X-Gm-Message-State: AIVw113hd3ileuLK8KWwiZ+S4FVWG5IuUlZQC5JUDC6Sf3WOO9ZvrZdO ZkI8SRoe1d1mjZbc1ko= X-Received: by 10.99.66.1 with SMTP id p1mr625330pga.120.1500429770418; Tue, 18 Jul 2017 19:02:50 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id d185sm5948697pgc.39.2017.07.18.19.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 19:02:49 -0700 (PDT) From: Jakub Kicinski To: linville@tuxdriver.com Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH ethtool net] ethtool: fix the rx vs tx mixup in set channel message Date: Tue, 18 Jul 2017 19:02:32 -0700 Message-Id: <20170719020232.19494-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When set channels (ethtool -L) doesn't modify any settings a message is printed which contains the current parameters: # ethtool -L em1 no channel parameters changed, aborting current values: tx 4 rx 1 other 0 combined 0 or # ethtool -L em1 rx 4 rx unmodified, ignoring no channel parameters changed, aborting current values: tx 4 rx 1 other 0 combined 0 In this message, however, rx and tx values are swapped, which can be confirmed running get: # ethtool -l em1 ... Current hardware settings: RX: 4 TX: 1 Other: 0 Combined: 0 Reorder the rx and tx names in the string thus keeping the order in line with ethtool -l. Signed-off-by: Jakub Kicinski --- ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethtool.c b/ethtool.c index ad18704e7c5f..4fd340540303 100644 --- a/ethtool.c +++ b/ethtool.c @@ -1995,7 +1995,7 @@ static int do_schannels(struct cmd_context *ctx) if (!changed) { fprintf(stderr, "no channel parameters changed, aborting\n"); - fprintf(stderr, "current values: tx %u rx %u other %u" + fprintf(stderr, "current values: rx %u tx %u other %u" " combined %u\n", echannels.rx_count, echannels.tx_count, echannels.other_count, echannels.combined_count);