From patchwork Tue Mar 7 22:46:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 736398 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 3vdD1J5Bc7z9sNJ for ; Wed, 8 Mar 2017 10:50:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mTOvusrH"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933322AbdCGXuM (ORCPT ); Tue, 7 Mar 2017 18:50:12 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35350 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756366AbdCGXuK (ORCPT ); Tue, 7 Mar 2017 18:50:10 -0500 Received: by mail-wr0-f194.google.com with SMTP id u108so2132854wrb.2; Tue, 07 Mar 2017 15:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KrvMbke4dlirxcWqmy87GC/fpNPD+OOK501eqk7auU8=; b=mTOvusrHAVqGkMbeF1/etz60xR/d/4hq+ZSa5/ParfXdrl7AQblmtQNewYuZDQhRb3 pOntIhsD1s9EnMIr8KdKguUT9+syGcFIlnApPr2YTyJNtqoQzZh2+ayq19o9a5N7SXLG qfpfOIgyP9aoic4kww5Nhz4RbWnkaSiC01e3EqGAmtTmN6gWSzQKTy10uNuRI9lLAULP dNg3h3U/xGayLfWaMkHYMoSp+oMs4wSBAlYuzGgaICbrQ0EPcDm0BAS7wBkwrrB4Ako/ 2GRmwoSm/s5ejgh5fg9fcFuwdz2jeGC69O430mUyz1ETdlbGeHVexk1aWhIksA8Ju9h+ TOWQ== 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=KrvMbke4dlirxcWqmy87GC/fpNPD+OOK501eqk7auU8=; b=Ki78YEPOfpNyRMzvvuP5/ZGDTSdKC7li2aHsNWFijrB0AY1AYPgdUwD/0BrtIiCztL kOahNMwNYEsOlaNOOWyRipjbFmQeOvIZFsfygpvjqvzOSHB+BkCf6F51PkDy86kNP4tB kS3qYm18+nbUZC3Bc9NenBhY6CqySayx9vtUNBcy+RtGASSrBy90tzPva5E85zHT9B5a SJP4AB08+nI1HZP1k8FVhZsocV4iQNaAlqmMG1cEmsxtMUF/+B8gyEtjl8MXwvk5HSbp VvE3JQcYDguwaXCojQbWHBbuxAg+MeN3fQynEL8yeBGuDzcLNlCb4v73SZLSzJg1HNN1 z2CA== X-Gm-Message-State: AMke39k2Xuhpr+nJKYAHh1U7CCUv5K1tRKPgz82Lfb5HS7H06++QNczD0c+z1up9bpavBg== X-Received: by 10.223.172.77 with SMTP id v71mr2625505wrc.131.1488926782941; Tue, 07 Mar 2017 14:46:22 -0800 (PST) Received: from localhost.localdomain (bny93-7-88-161-33-221.fbx.proxad.net. [88.161.33.221]) by smtp.gmail.com with ESMTPSA id q75sm2214209wmd.27.2017.03.07.14.46.21 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Mar 2017 14:46:22 -0800 (PST) From: Philippe Reynes To: davem@davemloft.net, mugunthanvnm@ti.com, a@unstable.cc, fw@strlen.de, jarod@redhat.com, stephen@networkplumber.org, edumazet@google.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH] net: via: via-rhine: use new api ethtool_{get|set}_link_ksettings Date: Tue, 7 Mar 2017 23:46:16 +0100 Message-Id: <1488926776-11073-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/ethernet/via/via-rhine.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index c068c58..4cf41f7 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c @@ -2303,25 +2303,27 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i strlcpy(info->bus_info, dev_name(hwdev), sizeof(info->bus_info)); } -static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +static int netdev_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) { struct rhine_private *rp = netdev_priv(dev); int rc; mutex_lock(&rp->task_lock); - rc = mii_ethtool_gset(&rp->mii_if, cmd); + rc = mii_ethtool_get_link_ksettings(&rp->mii_if, cmd); mutex_unlock(&rp->task_lock); return rc; } -static int netdev_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +static int netdev_set_link_ksettings(struct net_device *dev, + const struct ethtool_link_ksettings *cmd) { struct rhine_private *rp = netdev_priv(dev); int rc; mutex_lock(&rp->task_lock); - rc = mii_ethtool_sset(&rp->mii_if, cmd); + rc = mii_ethtool_set_link_ksettings(&rp->mii_if, cmd); rhine_set_carrier(&rp->mii_if); mutex_unlock(&rp->task_lock); @@ -2391,14 +2393,14 @@ static int rhine_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static const struct ethtool_ops netdev_ethtool_ops = { .get_drvinfo = netdev_get_drvinfo, - .get_settings = netdev_get_settings, - .set_settings = netdev_set_settings, .nway_reset = netdev_nway_reset, .get_link = netdev_get_link, .get_msglevel = netdev_get_msglevel, .set_msglevel = netdev_set_msglevel, .get_wol = rhine_get_wol, .set_wol = rhine_set_wol, + .get_link_ksettings = netdev_get_link_ksettings, + .set_link_ksettings = netdev_set_link_ksettings, }; static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)