net: ethtool: Remove PHYLIB direct dependency

Now that we have introduced ethtool_phy_ops and the PHY library
dynamically registers its operations with that function pointer, we can
remove the direct PHYLIB dependency in favor of using dynamic
operations.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/Kconfig b/net/Kconfig
index d1672280d6a4a9393876c31c587dde5b52c9a1dc..3831206977a1798814df64bdd2a81e05fa07f0a4 100644 (file)
--- 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 7194956aa09ec2e2bf7861a0d7c1ca3571b79325..888f6e101f347f599974b0a0c3c626cb92e5c3d8 100644 (file)
--- 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 ethtool_phy_ops *ops;
        struct net_device *dev;
        int ret;
 
@@ -81,11 +82,17 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
        }
 
        rtnl_lock();
+       ops = ethtool_phy_ops;
+       if (!ops || !ops->start_cable_test) {
+               ret = -EOPNOTSUPP;
+               goto out_rtnl;
+       }
+
        ret = ethnl_ops_begin(dev);
        if (ret < 0)
                goto out_rtnl;
 
-       ret = phy_start_cable_test(dev->phydev, info->extack);
+       ret = ops->start_cable_test(dev->phydev, info->extack);
 
        ethnl_ops_complete(dev);
 
@@ -308,6 +315,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 ethtool_phy_ops *ops;
        struct phy_tdr_config cfg;
        struct net_device *dev;
        int ret;
@@ -337,11 +345,17 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
                goto out_dev_put;
 
        rtnl_lock();
+       ops = ethtool_phy_ops;
+       if (!ops || !ops->start_cable_test_tdr) {
+               ret = -EOPNOTSUPP;
+               goto out_rtnl;
+       }
+
        ret = ethnl_ops_begin(dev);
        if (ret < 0)
                goto out_rtnl;
 
-       ret = phy_start_cable_test_tdr(dev->phydev, info->extack, &cfg);
+       ret = ops->start_cable_test_tdr(dev->phydev, info->extack, &cfg);
 
        ethnl_ops_complete(dev);