From patchwork Wed Mar 22 07:27:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Reynes X-Patchwork-Id: 741912 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 3vp1j16MCDz9s7R for ; Wed, 22 Mar 2017 18:36:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fmg9fa+5"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758842AbdCVHfL (ORCPT ); Wed, 22 Mar 2017 03:35:11 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36048 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758758AbdCVHfH (ORCPT ); Wed, 22 Mar 2017 03:35:07 -0400 Received: by mail-wr0-f194.google.com with SMTP id l37so25400748wrc.3; Wed, 22 Mar 2017 00:35:06 -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=RevljZhpy7oYdSRYq7q8TsA41pXwyVcdn0zUm3OFy7c=; b=Fmg9fa+5uDsV2iplKO39hSeyDLtP4+MDKWdS5I38QhSXf9RE7uhqNyAT99XNHujAZW S/kLPm1q/M8jYABdGaplGojpknTwfUBrPnDnsdRC+ngQRoQE6B3J+UNXLD92Co629LGC LaXt75MW8ZwB6tRtDl0Hjx/qjLFEA2Yh3YyEmQIt8OFdAEXns4ue7Vx+xrsitjQtuaOO YdRS5BRIX15tZ5tMMG7fXmHcJe5clZjCiZpXncbXPToAmdRYWaYEryJRAFZBqanSVSIu 6tQBQkuMDuv3c/Gzd8IWq90Ky3U1REXnAUZsPa+HPT9ifKEsY8F8XNxd13nghcbdFoWG 30HA== 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=RevljZhpy7oYdSRYq7q8TsA41pXwyVcdn0zUm3OFy7c=; b=GKTDcOKwJd0xdGr6Fre4jBcBdafkUibKBoEIkwJuYMew/xMxw+g8FXnJ6b+j3c8bQl tft7ob3lGPRGE9JIK2slp1yCgSrx/Iho+x0Iegt15omeR63kjAIyL2VfDqGH1I8ag037 AyHv/amck0mwDFDLESduoHCn27lE7wp3PnARJptHPG9J5TtDIPjktWoVjLWtN5UMOs+7 hra3Yx1OnQp3Jjs/sKIN6ammk5LlcC/HhxGXyvPIJspqkG4sERYAjxZ0tMSRPI7TSKi0 cGsJKCOTi+SKjFaiXv+rGt12hzD3tRC7baQtEiSBP8dxAuPw3kdbqWBXPOCJAUceARUb l3pg== X-Gm-Message-State: AFeK/H1NcI/UjbFPx18iZHj6H5rY5chEJfthV8eDLnuQiJS6HuRnvsMHVmzd1G3s1lN/Cw== X-Received: by 10.223.178.205 with SMTP id g71mr32344206wrd.158.1490167684644; Wed, 22 Mar 2017 00:28:04 -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 x1sm686134wrd.63.2017.03.22.00.28.03 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 00:28:03 -0700 (PDT) From: Philippe Reynes To: skhare@vmware.com, pv-drivers@vmware.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH] net: vmxnet3: use new api ethtool_{get|set}_link_ksettings Date: Wed, 22 Mar 2017 08:27:57 +0100 Message-Id: <1490167677-27130-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. Signed-off-by: Philippe Reynes --- drivers/net/vmxnet3/vmxnet3_ethtool.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c index f88ffaf..2ff2731 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethtool.c +++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c @@ -471,22 +471,25 @@ int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features) static int -vmxnet3_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) +vmxnet3_get_link_ksettings(struct net_device *netdev, + struct ethtool_link_ksettings *ecmd) { struct vmxnet3_adapter *adapter = netdev_priv(netdev); - ecmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_1000baseT_Full | - SUPPORTED_TP; - ecmd->advertising = ADVERTISED_TP; - ecmd->port = PORT_TP; - ecmd->transceiver = XCVR_INTERNAL; + ethtool_link_ksettings_zero_link_mode(ecmd, supported); + ethtool_link_ksettings_add_link_mode(ecmd, supported, 10000baseT_Full); + ethtool_link_ksettings_add_link_mode(ecmd, supported, 1000baseT_Full); + ethtool_link_ksettings_add_link_mode(ecmd, supported, TP); + ethtool_link_ksettings_zero_link_mode(ecmd, advertising); + ethtool_link_ksettings_add_link_mode(ecmd, advertising, TP); + ecmd->base.port = PORT_TP; if (adapter->link_speed) { - ethtool_cmd_speed_set(ecmd, adapter->link_speed); - ecmd->duplex = DUPLEX_FULL; + ecmd->base.speed = adapter->link_speed; + ecmd->base.duplex = DUPLEX_FULL; } else { - ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN); - ecmd->duplex = DUPLEX_UNKNOWN; + ecmd->base.speed = SPEED_UNKNOWN; + ecmd->base.duplex = DUPLEX_UNKNOWN; } return 0; } @@ -880,7 +883,6 @@ int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features) } static const struct ethtool_ops vmxnet3_ethtool_ops = { - .get_settings = vmxnet3_get_settings, .get_drvinfo = vmxnet3_get_drvinfo, .get_regs_len = vmxnet3_get_regs_len, .get_regs = vmxnet3_get_regs, @@ -900,6 +902,7 @@ int vmxnet3_set_features(struct net_device *netdev, netdev_features_t features) .get_rxfh = vmxnet3_get_rss, .set_rxfh = vmxnet3_set_rss, #endif + .get_link_ksettings = vmxnet3_get_link_ksettings, }; void vmxnet3_set_ethtool_ops(struct net_device *netdev)