From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CA53C43381 for ; Fri, 29 Mar 2019 19:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E993D218A3 for ; Fri, 29 Mar 2019 19:17:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="czG7uPwP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729824AbfC2TRZ (ORCPT ); Fri, 29 Mar 2019 15:17:25 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40775 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729483AbfC2TRX (ORCPT ); Fri, 29 Mar 2019 15:17:23 -0400 Received: by mail-wr1-f65.google.com with SMTP id h4so3880091wre.7 for ; Fri, 29 Mar 2019 12:17:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=lzo6+RcvI/w2HqP2TXGZctH9r9jrj3Ntp/O1bfoZ7z0=; b=czG7uPwPEIfr5u0uBns6MCHfwUIliLehI3Qu5AcVFMmCGMzb6oqhSnyBnYj3DVa0fY 1T/1eepf85qDepsPEQsV37FhlNGjX/RQFvDYyQaNWSy1V2J1FJNzSKiQqrF6f80eMThn jSdpBpi7ghkpq7WbzRakihA5QVFo9P9fncoSi9h2YKGyG48yTfHNi/uA5m6uCWFXuVqC UrZKKhNsjXCJqxboRym51tQHd0ub4WjCRIhAjGGlejlq/wjzuyvHTI6BGcjCkLOXqQkD MX73m4UezI256VHyEu1GKWnCsPPZvaejbrE2pW0rfQccXzuz71DXmS0k2/4gdM+kY9dy GcKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lzo6+RcvI/w2HqP2TXGZctH9r9jrj3Ntp/O1bfoZ7z0=; b=iGqNJ6HlqErzdbzCeiSAkc0zmFGsHTV/voKn/TcknETtQeLM5pWF4azhFUl6c5bLFN h5Wa5GCsp6KiJF0s+7IfzBy6wVr9VTmtGSgkYywVR2OQXuB5Op9FHWdTaxEKS1sLkl79 trztttG46NJKfjz8mXQvghXtygEMT4FUzG2/x5V7TVmySRxzlykyNFXm9t8qDF05rQ2n 3EZqbor9FPK1333968BzYT0nM6mKWmvv9h2etErJo2k+UO4Ajf2zs87dAVVWDgpWzF8R KPvEfMqJKRr8+CwW4IH4JCo3UVyiDbrnIsEo9W8UrWtKX0lNUfNN1Z/NCo8CkQSTIoRY ke2A== X-Gm-Message-State: APjAAAWl1xm11ckyv2X03AOBNrhY/CqM13hgbvLi+D/ut/dsogDZtILb 4y8hw0neRFWOX9H+DNz18DZdC15X X-Google-Smtp-Source: APXvYqzlcZRTIIHTTYeiz9KhKrs2v/m+aBWVISqxfqdDLcjn1jM+J0ASUjxHR1BCcOKfg0kAgrYn5Q== X-Received: by 2002:a5d:69c1:: with SMTP id s1mr35594968wrw.245.1553887042201; Fri, 29 Mar 2019 12:17:22 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:a991:cc44:5157:9e5? (p200300EA8BE1DD00A991CC44515709E5.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:a991:cc44:5157:9e5]) by smtp.googlemail.com with ESMTPSA id 61sm9620408wre.50.2019.03.29.12.17.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 12:17:21 -0700 (PDT) Subject: [PATCH v2 2/4] ethtool: simplify handling of PHY tunable downshift From: Heiner Kallweit To: John Linville , Andrew Lunn , Florian Fainelli Cc: "netdev@vger.kernel.org" References: <86b1ab67-fd7e-2789-1218-8c14e8198a60@gmail.com> Message-ID: Date: Fri, 29 Mar 2019 20:15:16 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <86b1ab67-fd7e-2789-1218-8c14e8198a60@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation of adding support for Fast Link Down as PHY tunable let's simplify the handling of PHY tunable downshift a little. Signed-off-by: Heiner Kallweit --- ethtool.c | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/ethtool.c b/ethtool.c index 59131e8..f67cd1b 100644 --- a/ethtool.c +++ b/ethtool.c @@ -4818,28 +4818,15 @@ static int do_get_phy_tunable(struct cmd_context *ctx) { int argc = ctx->argc; char **argp = ctx->argp; - u8 downshift_changed = 0; - int i; if (argc < 1) exit_bad_args(); - for (i = 0; i < argc; i++) { - if (!strcmp(argp[i], "downshift")) { - downshift_changed = 1; - i += 1; - if (i < argc) - exit_bad_args(); - } else { - exit_bad_args(); - } - } - if (downshift_changed) { + if (!strcmp(argp[0], "downshift")) { struct { struct ethtool_tunable ds; - u8 __count; + u8 count; } cont; - u8 count = 0; cont.ds.cmd = ETHTOOL_PHY_GTUNABLE; cont.ds.id = ETHTOOL_PHY_DOWNSHIFT; @@ -4849,11 +4836,12 @@ static int do_get_phy_tunable(struct cmd_context *ctx) perror("Cannot Get PHY downshift count"); return 87; } - count = *((u8 *)&cont.ds.data[0]); - if (count) - fprintf(stdout, "Downshift count: %d\n", count); + if (cont.count) + fprintf(stdout, "Downshift count: %d\n", cont.count); else fprintf(stdout, "Downshift disabled\n"); + } else { + exit_bad_args(); } return 0; @@ -4995,17 +4983,12 @@ static int do_set_phy_tunable(struct cmd_context *ctx) u8 ds_cnt = DOWNSHIFT_DEV_DEFAULT_COUNT; u8 ds_changed = 0, ds_has_cnt = 0, ds_enable = 0; - if (ctx->argc == 0) - exit_bad_args(); - /* Parse arguments */ - while (ctx->argc) { - if (parse_named_bool(ctx, "downshift", &ds_enable)) { - ds_changed = 1; - ds_has_cnt = parse_named_u8(ctx, "count", &ds_cnt); - } else { - exit_bad_args(); - } + if (parse_named_bool(ctx, "downshift", &ds_enable)) { + ds_changed = 1; + ds_has_cnt = parse_named_u8(ctx, "count", &ds_cnt); + } else { + exit_bad_args(); } /* Validate parameters */ @@ -5029,14 +5012,14 @@ static int do_set_phy_tunable(struct cmd_context *ctx) if (ds_changed) { struct { struct ethtool_tunable ds; - u8 __count; + u8 count; } cont; cont.ds.cmd = ETHTOOL_PHY_STUNABLE; cont.ds.id = ETHTOOL_PHY_DOWNSHIFT; cont.ds.type_id = ETHTOOL_TUNABLE_U8; cont.ds.len = 1; - *((u8 *)&cont.ds.data[0]) = ds_cnt; + cont.count = ds_cnt; err = send_ioctl(ctx, &cont.ds); if (err < 0) { perror("Cannot Set PHY downshift count"); -- 2.21.0