From patchwork Mon Mar 6 22:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 735991 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 3vcbX26jm5z9s7y for ; Tue, 7 Mar 2017 10:26:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A1hEAl4J"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176AbdCFX0Y (ORCPT ); Mon, 6 Mar 2017 18:26:24 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36653 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753830AbdCFX0U (ORCPT ); Mon, 6 Mar 2017 18:26:20 -0500 Received: by mail-wr0-f193.google.com with SMTP id l37so23552669wrc.3 for ; Mon, 06 Mar 2017 15:25:24 -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=GJ94391somuqWkHtcgnXhJOBVAQ0huMT8JoortDZbDU=; b=A1hEAl4JMGRTC9xZPO/zIA2DWL0Cx72p5oQmGpOYRq6fDp/BceATch0BixJvPMnU17 du5XcCcKH1sEUsV8XwSM1l8H6c68pi/YfjOKAjFh0H3ooTf9cKk4qgOYtmnAuWswTYzH Uo2B1dHNFx8eQfos0iL8oyBxTDcVc97Luyepnf3eUXSxOrOIB1qSROMX5Jn9yL1115ny /3IcBORFG3g/U1RYtLUIDUm9IO033wWb617cc/ptGCXqhoSEV35KI2AdZS97yGO+R27C 12uj+1vsDDEFC5zF/0DQk2gMYHXK7JNFgEBqNs107bEugg1/7t5h+wT5nUu9gRuotFuD im5w== 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=GJ94391somuqWkHtcgnXhJOBVAQ0huMT8JoortDZbDU=; b=ijRv26Y5pt9X22L8qgEuMvt+nwXbZYfkfY0NymY37hcImW+ZHmFMdmsazErGLWz5hQ tILPaofb8GQ/LKangn5WbweVjl497tx9cKbFLxuyZnTp6Y66se5peL0SEKsYYTlozGZ2 uJiCXMH4HxTkidyLBT66IYzn70eboNIWdpn6MzMAkIWySN9nu2GiVYh/+4g4r3TtntBA BCc1ePnArhKGJViCifdCkrcP7GE8N9BNPLAqOnN6AuLq+VbYlE3FYMVhCjljWkoNmfKv FYULtXr0sCN5cO4uT6M3hqdokSoxpoy+TCEyBRxrc9rOnaAD4JRnqjClM4cDFeZYMQsd iISA== X-Gm-Message-State: AMke39kx4XOpLGVuf+XGnAFEsQKPEE2NumfXsedSf/dDbfXuOO0Jikja4VFRqfNpHJkClg== X-Received: by 10.223.176.225 with SMTP id j30mr15711191wra.25.1488839180918; Mon, 06 Mar 2017 14:26:20 -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 63sm16359802wmp.9.2017.03.06.14.26.19 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 14:26:20 -0800 (PST) From: Philippe Reynes To: davem@davemloft.net, paul.gortmaker@windriver.com, jarod@redhat.com, julia.lawall@lip6.fr, edumazet@google.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH] net: tundra: tsi108: use new api ethtool_{get|set}_link_ksettings Date: Mon, 6 Mar 2017 23:26:09 +0100 Message-Id: <1488839169-3813-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/tundra/tsi108_eth.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index c558399..5ac6eaa 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c @@ -1499,27 +1499,29 @@ static void tsi108_init_mac(struct net_device *dev) TSI_WRITE(TSI108_EC_INTMASK, ~0); } -static int tsi108_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) +static int tsi108_get_link_ksettings(struct net_device *dev, + struct ethtool_link_ksettings *cmd) { struct tsi108_prv_data *data = netdev_priv(dev); unsigned long flags; int rc; spin_lock_irqsave(&data->txlock, flags); - rc = mii_ethtool_gset(&data->mii_if, cmd); + rc = mii_ethtool_get_link_ksettings(&data->mii_if, cmd); spin_unlock_irqrestore(&data->txlock, flags); return rc; } -static int tsi108_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) +static int tsi108_set_link_ksettings(struct net_device *dev, + const struct ethtool_link_ksettings *cmd) { struct tsi108_prv_data *data = netdev_priv(dev); unsigned long flags; int rc; spin_lock_irqsave(&data->txlock, flags); - rc = mii_ethtool_sset(&data->mii_if, cmd); + rc = mii_ethtool_set_link_ksettings(&data->mii_if, cmd); spin_unlock_irqrestore(&data->txlock, flags); return rc; @@ -1535,8 +1537,8 @@ static int tsi108_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static const struct ethtool_ops tsi108_ethtool_ops = { .get_link = ethtool_op_get_link, - .get_settings = tsi108_get_settings, - .set_settings = tsi108_set_settings, + .get_link_ksettings = tsi108_get_link_ksettings, + .set_link_ksettings = tsi108_set_link_ksettings, }; static const struct net_device_ops tsi108_netdev_ops = {