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

net: ethtool: plca: Target the command to the requested PHY 



PLCA 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 95132a01

net/ethtool/plca.c

+6 −7
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, 
	int ret;



	// check that the PHY device is available and connected

	if (!dev->phydev) {

	if (!req_base->phydev) {

		ret = -EOPNOTSUPP;

		goto out;

	}
@@ -80,7 +80,7 @@ static int plca_get_cfg_prepare_data(const struct ethnl_req_info *req_base, 
	memset(&data->plca_cfg, 0xff,

	       sizeof_field(struct plca_reply_data, plca_cfg));



	ret = ops->get_plca_cfg(dev->phydev, &data->plca_cfg);

	ret = ops->get_plca_cfg(req_base->phydev, &data->plca_cfg);

	ethnl_ops_complete(dev);



out:
@@ -141,7 +141,6 @@ const struct nla_policy ethnl_plca_set_cfg_policy[] = { 
static int

ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info)

{

	struct net_device *dev = req_info->dev;

	const struct ethtool_phy_ops *ops;

	struct nlattr **tb = info->attrs;

	struct phy_plca_cfg plca_cfg;
@@ -149,7 +148,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) 
	int ret;



	// check that the PHY device is available and connected

	if (!dev->phydev)

	if (!req_info->phydev)

		return -EOPNOTSUPP;



	ops = ethtool_phy_ops;
@@ -168,7 +167,7 @@ ethnl_set_plca(struct ethnl_req_info *req_info, struct genl_info *info) 
	if (!mod)

		return 0;



	ret = ops->set_plca_cfg(dev->phydev, &plca_cfg, info->extack);

	ret = ops->set_plca_cfg(req_info->phydev, &plca_cfg, info->extack);

	return ret < 0 ? ret : 1;

}
@@ -204,7 +203,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, 
	int ret;



	// check that the PHY device is available and connected

	if (!dev->phydev) {

	if (!req_base->phydev) {

		ret = -EOPNOTSUPP;

		goto out;

	}
@@ -223,7 +222,7 @@ static int plca_get_status_prepare_data(const struct ethnl_req_info *req_base, 
	memset(&data->plca_st, 0xff,

	       sizeof_field(struct plca_reply_data, plca_st));



	ret = ops->get_plca_status(dev->phydev, &data->plca_st);

	ret = ops->get_plca_status(req_base->phydev, &data->plca_st);

	ethnl_ops_complete(dev);

out:

	return ret;