lkml.org 
[lkml]   [2020]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net-next 4/4] net: ethtool: Remove PHYLIB dependency
Date
Now that we have converted the ethtool/cabletest code to use netdev_ops,
we can remove the PHY library dependency since the function pointers
will now be provided upon PHY attachment to the network device.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/Kconfig | 1 -
net/ethtool/cabletest.c | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/net/Kconfig b/net/Kconfig
index d1672280d6a4..3831206977a1 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -455,7 +455,6 @@ config FAILOVER
config ETHTOOL_NETLINK
bool "Netlink interface for ethtool"
default y
- depends on PHYLIB=y || PHYLIB=n
help
An alternative userspace interface for ethtool based on generic
netlink. It provides better extensibility and some new features,
diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c
index 0d940a91493b..d8e2eb427613 100644
--- a/net/ethtool/cabletest.c
+++ b/net/ethtool/cabletest.c
@@ -58,6 +58,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr *tb[ETHTOOL_A_CABLE_TEST_MAX + 1];
struct ethnl_req_info req_info = {};
+ const struct net_device_ops *ops;
struct net_device *dev;
int ret;

@@ -75,7 +76,8 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
return ret;

dev = req_info.dev;
- if (!dev->phydev) {
+ ops = dev->netdev_ops;
+ if (!ops->ndo_cable_test_start) {
ret = -EOPNOTSUPP;
goto out_dev_put;
}
@@ -85,7 +87,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
if (ret < 0)
goto out_rtnl;

- ret = phy_start_cable_test(dev, info->extack);
+ ret = ops->ndo_cable_test_start(dev, info->extack);

ethnl_ops_complete(dev);

@@ -308,6 +310,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr *tb[ETHTOOL_A_CABLE_TEST_TDR_MAX + 1];
struct ethnl_req_info req_info = {};
+ const struct net_device_ops *ops;
struct phy_tdr_config cfg;
struct net_device *dev;
int ret;
@@ -326,7 +329,8 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
return ret;

dev = req_info.dev;
- if (!dev->phydev) {
+ ops = dev->netdev_ops;
+ if (!ops->ndo_cable_test_tdr_start) {
ret = -EOPNOTSUPP;
goto out_dev_put;
}
@@ -341,7 +345,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
if (ret < 0)
goto out_rtnl;

- ret = phy_start_cable_test_tdr(dev, info->extack, &cfg);
+ ret = ops->ndo_cable_test_tdr_start(dev, info->extack, &cfg);

ethnl_ops_complete(dev);

--
2.25.1
\
 
 \ /
  Last update: 2020-07-02 06:31    [W:0.072 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site