From patchwork Tue Nov 13 14:45:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Russkikh X-Patchwork-Id: 10680871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D444914D6 for ; Tue, 13 Nov 2018 14:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3D241FF62 for ; Tue, 13 Nov 2018 14:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B832E28E66; Tue, 13 Nov 2018 14:45:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FE561FF62 for ; Tue, 13 Nov 2018 14:45:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387868AbeKNAnl (ORCPT ); Tue, 13 Nov 2018 19:43:41 -0500 Received: from mail-eopbgr710061.outbound.protection.outlook.com ([40.107.71.61]:61856 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387650AbeKNAnl (ORCPT ); Tue, 13 Nov 2018 19:43:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nchuxKqAP37WbAJQzpFaqTAn/JdRRQzIu2Ro6Zz019s=; b=Lj57jD2jY639msm+ETyUzK3Ke62Gmgvv8EbDsMtj+SHm6KMQ3NO8pS+aA0T3SPyZLP4qlmYq6zjW2IAnHBk0bp8bKxufXPKid6I/u1D6jOP2NDj1JwiyieyLFhFBx4e2fM3LwUXn2P3vTV9Pjyjr5smsDb6NaGFI1yaDPcgBosM= Received: from BY1PR0701MB1660.namprd07.prod.outlook.com (10.162.110.22) by BY1PR0701MB1349.namprd07.prod.outlook.com (10.160.109.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.25; Tue, 13 Nov 2018 14:45:11 +0000 Received: from BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11]) by BY1PR0701MB1660.namprd07.prod.outlook.com ([fe80::c031:16d9:9580:3d11%6]) with mapi id 15.20.1294.045; Tue, 13 Nov 2018 14:45:11 +0000 From: Igor Russkikh To: "David S . Miller" CC: "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" , Dmitry Bezrukov , Igor Russkikh Subject: [PATCH v2 net-next 17/21] net: usb: aqc111: Initialize ethtool_ops structure Thread-Topic: [PATCH v2 net-next 17/21] net: usb: aqc111: Initialize ethtool_ops structure Thread-Index: AQHUe196HWcOtwg2Bk+Anwh9Sn07Mw== Date: Tue, 13 Nov 2018 14:45:11 +0000 Message-ID: <93d23eb71435d4e9c53222cfb588f9b01c2f39af.1542119058.git.igor.russkikh@aquantia.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5P189CA0013.EURP189.PROD.OUTLOOK.COM (2603:10a6:206:15::26) To BY1PR0701MB1660.namprd07.prod.outlook.com (2a01:111:e400:522a::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Igor.Russkikh@aquantia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [95.79.108.179] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;BY1PR0701MB1349;6:brfs4/yYtUCNYQTCRaEtuvCgDLwIcvP2PryAZ0whfreE5Qouems/HrdcPIne44rhhx5eYi1GiA2eKSEctKdgYrJchXE5O1sJ3VCO6Cyvqz2+bba5DC/+6Rwv1LlBjaGYJMZHzi9oP4kJYGedLRE/oE4S6iN2wfIoWW+kMQXLyGsGLirprFqlii7aBsgZeBqWAY3EBJoLE/xm+SoRSV9YhZk8jT3vCaF8CPc6KtuV5U6mJCZRCIP5hyjS7Yh0wbmogA7mhW+VYjqBSYm6qBD5YOkdiA81yxCfjRLo2QGhT2MbnTkDailU6lIyHx8WIbg0OiPf2UwIjR/Finxf5Un4cMgIA+5TtaUw2z7J4Ug8k0AEROYe8C+ebvvRQD+3tgSwoX4s3i+DAH4+ZifAasxHeXeznCmkKEtj9BZ0/gX3yOXnWAKFNtzRjhLE0V3W0gL+1iTZVYmHg43v/OoDQHBHcw==;5:95ZVmhQ0cnT1y1hCbRIVaKCNSXUQUnGzYUuQzTX2ZdE3T/dIQ5ZK/11DXVfi99iU7lYwkTaEazQTOaUKBtxmlegq91Bh1nyb847bPkUAuON0tQXIWtI8W2dXZkU0t5P0+ANyzRsi3Pix1OVupcTn2JJsXqIMqfor8pnuU1IF6jU=;7:/e5oSlA9jM5oiaibz9HkWdg8snSFxfPMrwIxOi6Z1joQsJ/eAyckkNe8Y3RGl/WqXYRJmiQn4qe159oodAB/VMNEuFHC6mN+tAf2NtXgj3WVtFiNKVD6HJJmNkGf1Di8WqQV6WLV26Qqi0z9NhR2mQ== x-ms-office365-filtering-correlation-id: 79fb2a3a-a0b5-4461-7323-08d649769d23 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390060)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY1PR0701MB1349; x-ms-traffictypediagnostic: BY1PR0701MB1349: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231382)(944501410)(52105112)(93006095)(93001095)(148016)(149066)(150057)(6041310)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051)(76991095);SRVR:BY1PR0701MB1349;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1349; x-forefront-prvs: 085551F5A8 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39850400004)(376002)(346002)(396003)(366004)(136003)(199004)(189003)(5660300001)(478600001)(54906003)(71200400001)(14454004)(71190400001)(6436002)(105586002)(76176011)(52116002)(36756003)(4326008)(68736007)(99286004)(97736004)(81166006)(81156014)(8676002)(2906002)(86362001)(7736002)(316002)(575784001)(72206003)(305945005)(107886003)(2616005)(66066001)(6512007)(8936002)(2900100001)(256004)(25786009)(6916009)(106356001)(11346002)(44832011)(3846002)(6116002)(6486002)(53936002)(486006)(186003)(118296001)(6506007)(386003)(446003)(476003)(102836004)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR0701MB1349;H:BY1PR0701MB1660.namprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 9KBFXOtTCrtwnIkAYWISi19SaYZkldTAtOgmnKhU2rXO5zliMSToK6LhK3JEzVQUfbA6nqhWqDmWtZLt1c/leqi8YZz1Vdg+zXiPZiDrpqsyL0hACwhtOAD50ViO2JXyG92Ok8YSK/TqFvwgv4JJw+pJCGH3xIje5ckW8AY8VOVqR0fItu+sXgJm0xUT37mZ0Gp4JFSGA4huqVQ7Nw74wf7uYGWPZx8Dg6dYEHy2AbF9KDjvoL65UNi5hABngDgY650V6abu8150YgysdSE/lTIZ5MlSdVK75Jyyho5kJbrAeXYDg6hjJl2+3At0QuC4skRyZmbj7CDgVrLfrieweF+h9+N65B1zSEPtPWLmZnI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79fb2a3a-a0b5-4461-7323-08d649769d23 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2018 14:45:11.5232 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 83e2e134-991c-4ede-8ced-34d47e38e6b1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1349 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dmitry Bezrukov Implement get_drvinfo, set/get_msglevel, get_link callbacks Signed-off-by: Dmitry Bezrukov Signed-off-by: Igor Russkikh --- drivers/net/usb/aqc111.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c index 34e09492fb0e..b3160b0320eb 100644 --- a/drivers/net/usb/aqc111.c +++ b/drivers/net/usb/aqc111.c @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -18,6 +19,8 @@ #include "aqc111.h" +#define DRIVER_NAME "aqc111" + static int aqc111_read_cmd_nopm(struct usbnet *dev, u8 cmd, u16 value, u16 index, u16 size, void *data) { @@ -189,6 +192,23 @@ static int aqc111_mdio_write(struct usbnet *dev, u16 value, return aqc111_write16_cmd(dev, AQ_PHY_CMD, value, index, data); } +static void aqc111_get_drvinfo(struct net_device *net, + struct ethtool_drvinfo *info) +{ + struct usbnet *dev = netdev_priv(net); + struct aqc111_data *aqc111_data = dev->driver_priv; + + /* Inherit standard device info */ + usbnet_get_drvinfo(net, info); + strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver)); + snprintf(info->fw_version, sizeof(info->fw_version), "%u.%u.%u", + aqc111_data->fw_ver.major, + aqc111_data->fw_ver.minor, + aqc111_data->fw_ver.rev); + info->eedump_len = 0x00; + info->regdump_len = 0x00; +} + static void aqc111_set_phy_speed_fw_iface(struct usbnet *dev, struct aqc111_data *aqc111_data) { @@ -305,6 +325,13 @@ static void aqc111_set_phy_speed(struct usbnet *dev, u8 autoneg, u16 speed) aqc111_set_phy_speed_fw_iface(dev, aqc111_data); } +static const struct ethtool_ops aqc111_ethtool_ops = { + .get_drvinfo = aqc111_get_drvinfo, + .get_msglevel = usbnet_get_msglevel, + .set_msglevel = usbnet_set_msglevel, + .get_link = ethtool_op_get_link, +}; + static int aqc111_change_mtu(struct net_device *net, int new_mtu) { struct usbnet *dev = netdev_priv(net); @@ -615,6 +642,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->max_mtu = 16334; dev->net->netdev_ops = &aqc111_netdev_ops; + dev->net->ethtool_ops = &aqc111_ethtool_ops; if (usb_device_no_sg_constraint(dev->udev)) dev->can_dma_sg = 1;