Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754792AbdCPWX5 (ORCPT ); Thu, 16 Mar 2017 18:23:57 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35680 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686AbdCPWUG (ORCPT ); Thu, 16 Mar 2017 18:20:06 -0400 From: Philippe Reynes To: oliver@neukum.org, jacmet@sunsite.dk, steve.glendinning@shawell.net, UNGLinuxDriver@microchip.com, gregkh@linuxfoundation.org, davem@davemloft.net, robert.foss@collabora.com, allan@asix.com.tw, grundler@google.com, jarod@redhat.com, peter.chen@nxp.com, stefan.bruens@rwth-aachen.de, akpm@linux-foundation.org, adobriyan@gmail.com Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH 04/11] net: usb: cdc_ncm: use new api ethtool_{get|set}_link_ksettings Date: Thu, 16 Mar 2017 23:18:50 +0100 Message-Id: <1489702737-2401-5-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1489702737-2401-1-git-send-email-tremyfr@gmail.com> References: <1489702737-2401-1-git-send-email-tremyfr@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1389 Lines: 35 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/cdc_ncm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index f317984..b6c1d3a 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -131,8 +131,6 @@ static void cdc_ncm_get_strings(struct net_device __always_unused *netdev, u32 s static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx); static const struct ethtool_ops cdc_ncm_ethtool_ops = { - .get_settings = usbnet_get_settings, - .set_settings = usbnet_set_settings, .get_link = usbnet_get_link, .nway_reset = usbnet_nway_reset, .get_drvinfo = usbnet_get_drvinfo, @@ -142,6 +140,8 @@ static void cdc_ncm_get_strings(struct net_device __always_unused *netdev, u32 s .get_sset_count = cdc_ncm_get_sset_count, .get_strings = cdc_ncm_get_strings, .get_ethtool_stats = cdc_ncm_get_ethtool_stats, + .get_link_ksettings = usbnet_get_link_ksettings, + .set_link_ksettings = usbnet_set_link_ksettings, }; static u32 cdc_ncm_check_rx_max(struct usbnet *dev, u32 new_rx) -- 1.7.4.4