Commit fcc4b105 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: ethtool: cable-test: Target the command to the requested PHY 



Cable testing is a PHY-specific command. Instead of targeting the command
towards dev->phydev, use the request to pick the targeted PHY.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 345237db

net/ethtool/cabletest.c

+6 −6
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info) 
		return ret;



	dev = req_info.dev;

	if (!dev->phydev) {

	if (!req_info.phydev) {

		ret = -EOPNOTSUPP;

		goto out_dev_put;

	}
@@ -85,12 +85,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(req_info.phydev, info->extack);



	ethnl_ops_complete(dev);



	if (!ret)

		ethnl_cable_test_started(dev->phydev,

		ethnl_cable_test_started(req_info.phydev,

					 ETHTOOL_MSG_CABLE_TEST_NTF);



out_rtnl:
@@ -321,7 +321,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info) 
		return ret;



	dev = req_info.dev;

	if (!dev->phydev) {

	if (!req_info.phydev) {

		ret = -EOPNOTSUPP;

		goto out_dev_put;

	}
@@ -342,12 +342,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(req_info.phydev, info->extack, &cfg);



	ethnl_ops_complete(dev);



	if (!ret)

		ethnl_cable_test_started(dev->phydev,

		ethnl_cable_test_started(req_info.phydev,

					 ETHTOOL_MSG_CABLE_TEST_TDR_NTF);



out_rtnl: