From patchwork Sun Mar 12 17:02:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 737837 X-Patchwork-Delegate: davem@davemloft.net 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 3vh6kp2jZhz9s7g for ; Mon, 13 Mar 2017 04:02:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n+DCna7u"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934315AbdCLRCq (ORCPT ); Sun, 12 Mar 2017 13:02:46 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34328 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934000AbdCLRCp (ORCPT ); Sun, 12 Mar 2017 13:02:45 -0400 Received: by mail-wr0-f196.google.com with SMTP id u48so17432315wrc.1; Sun, 12 Mar 2017 10:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ErjE9gE3n2rPG4ujYAulHsKUJgTUj7I4xgBGd3M2cgc=; b=n+DCna7uGxWjZcSaIrsrlxZyV5VORI2KMD8DtufGFk8vIssdDgIc78RkYSjTPSgLA4 ru1RQfCmJWVShmqWKx7V4+Rw1PzPh3rpzFuKv8P+xV/FsRsibq3360e3/aF9LmWAFggF JOEf/GXYwLq3ux0vv9nOrqtsJCYCXgXwZtqo/pJgFmCPzEtUjzkHyLF9VuuNClDJtIUt LlgFjLu/Vs+1IP19R+fVnuYzoX8Ni321Ta4KaWuRRV1Sgvz+aISsGdOrqOv4rFwRX8jN qqkXTVo/1qnCkOEOj0FFqmVaiFZTXqMWT7G64yJJ3Ah5s4FqCQfEFdBaIKe+ipqwUKKe Nalw== 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=ErjE9gE3n2rPG4ujYAulHsKUJgTUj7I4xgBGd3M2cgc=; b=ifGhYRBAV8/0H73RELjxieF/bEwvWsy/tR5+/PZkKzZY64wfFcd1tL8w3uzXqTQEXJ 0zRPUiuh+tu0NjoEQs9o0bitVShxW9EWr32CRlfj5Q/N2XOv6vzCXtTs4z/wdQpYc9aj Gz6jdAR0PFwL8htMVVOVh8U1EV2xfgjoxGM0F9hxAhaMVVvbI1Y+ykJQ0t7NujImMkty Gz+Mhlx3XXpapQ01ZGyRhOM333r3STp9llgGWj0Nyv05SuhJOLAVA+kjD7zf+j93FqUi XxLKSkcI8lvf4Dr0/9zE6S7MRkFxEHKErY+E/vztYm0849XmWHoJCItWXjjFoRgvq2qn dTcQ== X-Gm-Message-State: AMke39nppr46lAI4a23c32UHcmni0e6bmzRvDbY5/i2WUmhpz0pLC1KpsxLzFOeKeD1R8g== X-Received: by 10.223.164.140 with SMTP id g12mr24413726wrb.87.1489338162802; Sun, 12 Mar 2017 10:02:42 -0700 (PDT) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by smtp.gmail.com with ESMTPSA id c9sm8002389wmf.18.2017.03.12.10.02.41 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Mar 2017 10:02:41 -0700 (PDT) From: Philippe Reynes To: davem@davemloft.net, jarod@redhat.com, chris.roth@usask.ca, allan@asix.com.tw Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH] net: usb: asix88179_178a: use new api ethtool_{get|set}_link_ksettings Date: Sun, 12 Mar 2017 18:02:36 +0100 Message-Id: <1489338156-18632-1-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ethtool api {get|set}_settings is deprecated. We move this driver to new api {get|set}_link_ksettings. As I don't have the hardware, I'd be very pleased if someone may test this patch. Signed-off-by: Philippe Reynes --- drivers/net/usb/ax88179_178a.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index a3a7db0..4a0ae7c 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -620,16 +620,18 @@ static int ax88179_get_eeprom_len(struct net_device *net) return 0; } -static int ax88179_get_settings(struct net_device *net, struct ethtool_cmd *cmd) +static int ax88179_get_link_ksettings(struct net_device *net, + struct ethtool_link_ksettings *cmd) { struct usbnet *dev = netdev_priv(net); - return mii_ethtool_gset(&dev->mii, cmd); + return mii_ethtool_get_link_ksettings(&dev->mii, cmd); } -static int ax88179_set_settings(struct net_device *net, struct ethtool_cmd *cmd) +static int ax88179_set_link_ksettings(struct net_device *net, + const struct ethtool_link_ksettings *cmd) { struct usbnet *dev = netdev_priv(net); - return mii_ethtool_sset(&dev->mii, cmd); + return mii_ethtool_set_link_ksettings(&dev->mii, cmd); } static int @@ -826,11 +828,11 @@ static int ax88179_ioctl(struct net_device *net, struct ifreq *rq, int cmd) .set_wol = ax88179_set_wol, .get_eeprom_len = ax88179_get_eeprom_len, .get_eeprom = ax88179_get_eeprom, - .get_settings = ax88179_get_settings, - .set_settings = ax88179_set_settings, .get_eee = ax88179_get_eee, .set_eee = ax88179_set_eee, .nway_reset = usbnet_nway_reset, + .get_link_ksettings = ax88179_get_link_ksettings, + .set_link_ksettings = ax88179_set_link_ksettings, }; static void ax88179_set_multicast(struct net_device *net)