From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751076AbcEHVo4 (ORCPT ); Sun, 8 May 2016 17:44:56 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33094 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbcEHVox (ORCPT ); Sun, 8 May 2016 17:44:53 -0400 From: Philippe Reynes To: fugang.duan@nxp.com, davem@davemloft.net, ben@decadent.org.uk, kan.liang@intel.com, decot@googlers.com, aduyck@mirantis.com, jiri@mellanox.com, jacob.e.keller@intel.com, tom@herbertland.com, andrew@lunn.ch Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Reynes Subject: [PATCH v2 1/3] net: core: ethtool: add ethtool_op_{get|set}_link_ksettings Date: Sun, 8 May 2016 23:44:35 +0200 Message-Id: <1462743877-31738-2-git-send-email-tremyfr@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1462743877-31738-1-git-send-email-tremyfr@gmail.com> References: <1462743877-31738-1-git-send-email-tremyfr@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ethtool callbacks {get|set}_link_ksettings are often the same, so we add two generics functions ethtool_op_{get|set}_link_ksettings to avoid writing severals times the same function. Signed-off-by: Philippe Reynes --- include/linux/ethtool.h | 5 +++++ net/core/ethtool.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 9ded8c6..9a55836 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -157,6 +157,11 @@ void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst, bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, const unsigned long *src); +int ethtool_op_get_link_ksettings(struct net_device *ndev, + struct ethtool_link_ksettings *cmd); +int ethtool_op_set_link_ksettings(struct net_device *ndev, + const struct ethtool_link_ksettings *cmd); + /** * struct ethtool_ops - optional netdev operations * @get_settings: DEPRECATED, use %get_link_ksettings/%set_link_ksettings diff --git a/net/core/ethtool.c b/net/core/ethtool.c index bdb4013..b605fb1 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -852,6 +852,30 @@ static int ethtool_set_settings(struct net_device *dev, void __user *useraddr) return dev->ethtool_ops->set_settings(dev, &cmd); } +int ethtool_op_get_link_ksettings(struct net_device *ndev, + struct ethtool_link_ksettings *cmd) +{ + struct phy_device *phydev = ndev->phydev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_ksettings_get(phydev, cmd); +} +EXPORT_SYMBOL(ethtool_op_get_link_ksettings); + +int ethtool_op_set_link_ksettings(struct net_device *ndev, + const struct ethtool_link_ksettings *cmd) +{ + struct phy_device *phydev = ndev->phydev; + + if (!phydev) + return -ENODEV; + + return phy_ethtool_ksettings_set(phydev, cmd); +} +EXPORT_SYMBOL(ethtool_op_set_link_ksettings); + static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev, void __user *useraddr) { -- 1.7.4.4