---
  net/ethtool/cabletest.c | 35 ++++++++++++++++++++++-------------
  1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c
index f6f136ec7ddf..01db8f394869 100644
--- a/net/ethtool/cabletest.c
+++ b/net/ethtool/cabletest.c

@@ -13,7 +13,7 @@
  
  const struct nla_policy ethnl_cable_test_act_policy[] = {
  	[ETHTOOL_A_CABLE_TEST_HEADER]		=
-		NLA_POLICY_NESTED(ethnl_header_policy),
+		NLA_POLICY_NESTED(ethnl_header_policy_phy),
  };
  
  static int ethnl_cable_test_started(struct phy_device *phydev, u8 cmd)

@@ -58,6 +58,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
  	struct ethnl_req_info req_info = {};
  	const struct ethtool_phy_ops *ops;
  	struct nlattr **tb = info->attrs;
+	struct phy_device *phydev;
  	struct net_device *dev;
  	int ret;
  

@@ -69,12 +70,16 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
  		return ret;
  
  	dev = req_info.dev;
-	if (!dev->phydev) {
+
+	rtnl_lock();
+	phydev = ethnl_req_get_phydev(&req_info,
+				      tb[ETHTOOL_A_CABLE_TEST_HEADER],
+				      info->extack);
+	if (IS_ERR_OR_NULL(phydev)) {
  		ret = -EOPNOTSUPP;
  		goto out_dev_put;
  	}
  
-	rtnl_lock();
  	ops = ethtool_phy_ops;
  	if (!ops || !ops->start_cable_test) {
  		ret = -EOPNOTSUPP;

@@ -85,13 +90,12 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
  	if (ret < 0)
  		goto out_rtnl;
  
-	ret = ops->start_cable_test(dev->phydev, info->extack);
+	ret = ops->start_cable_test(phydev, info->extack);
  
  	ethnl_ops_complete(dev);
  
  	if (!ret)
-		ethnl_cable_test_started(dev->phydev,
-					 ETHTOOL_MSG_CABLE_TEST_NTF);
+		ethnl_cable_test_started(phydev, ETHTOOL_MSG_CABLE_TEST_NTF);
  
  out_rtnl:
  	rtnl_unlock();

@@ -216,7 +220,7 @@ static const struct nla_policy cable_test_tdr_act_cfg_policy[] = {
  
  const struct nla_policy ethnl_cable_test_tdr_act_policy[] = {
  	[ETHTOOL_A_CABLE_TEST_TDR_HEADER]	=
-		NLA_POLICY_NESTED(ethnl_header_policy),
+		NLA_POLICY_NESTED(ethnl_header_policy_phy),
  	[ETHTOOL_A_CABLE_TEST_TDR_CFG]		= { .type = NLA_NESTED },
  };
  

@@ -305,6 +309,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
  	struct ethnl_req_info req_info = {};
  	const struct ethtool_phy_ops *ops;
  	struct nlattr **tb = info->attrs;
+	struct phy_device *phydev;
  	struct phy_tdr_config cfg;
  	struct net_device *dev;
  	int ret;

@@ -317,10 +322,6 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
  		return ret;
  
  	dev = req_info.dev;
-	if (!dev->phydev) {
-		ret = -EOPNOTSUPP;
-		goto out_dev_put;
-	}
  
  	ret = ethnl_act_cable_test_tdr_cfg(tb[ETHTOOL_A_CABLE_TEST_TDR_CFG],
  					   info, &cfg);

@@ -328,6 +329,14 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
  		goto out_dev_put;
  
  	rtnl_lock();
+	phydev = ethnl_req_get_phydev(&req_info,
+				      tb[ETHTOOL_A_CABLE_TEST_TDR_HEADER],
+				      info->extack);
+	if (!IS_ERR_OR_NULL(phydev)) {
+		ret = -EOPNOTSUPP;
+		goto out_dev_put;
+	}
+
  	ops = ethtool_phy_ops;
  	if (!ops || !ops->start_cable_test_tdr) {
  		ret = -EOPNOTSUPP;

@@ -338,12 +347,12 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
  	if (ret < 0)
  		goto out_rtnl;
  
-	ret = ops->start_cable_test_tdr(dev->phydev, info->extack, &cfg);
+	ret = ops->start_cable_test_tdr(phydev, info->extack, &cfg);
  
  	ethnl_ops_complete(dev);
  
  	if (!ret)
-		ethnl_cable_test_started(dev->phydev,
+		ethnl_cable_test_started(phydev,
  					 ETHTOOL_MSG_CABLE_TEST_TDR_NTF);
  
  out_rtnl: