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

net: ethtool: pse-pd: Target the command to the requested PHY 



PSE and PD configuration is a PHY-specific command. Instead of targeting
the command towards dev->phydev, use the request to pick the targeted
PHY device.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7db69ec9

net/ethtool/pse-pd.c

+3 −6
Original line number Diff line number Diff line
@@ -31,12 +31,10 @@ const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1] = { 
	[ETHTOOL_A_PSE_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy),

};



static int pse_get_pse_attributes(struct net_device *dev,

static int pse_get_pse_attributes(struct phy_device *phydev,

				  struct netlink_ext_ack *extack,

				  struct pse_reply_data *data)

{

	struct phy_device *phydev = dev->phydev;



	if (!phydev) {

		NL_SET_ERR_MSG(extack, "No PHY is attached");

		return -EOPNOTSUPP;
@@ -64,7 +62,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, 
	if (ret < 0)

		return ret;



	ret = pse_get_pse_attributes(dev, info->extack, data);

	ret = pse_get_pse_attributes(req_base->phydev, info->extack, data);



	ethnl_ops_complete(dev);
@@ -124,7 +122,6 @@ ethnl_set_pse_validate(struct ethnl_req_info *req_info, struct genl_info *info) 
static int

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

{

	struct net_device *dev = req_info->dev;

	struct pse_control_config config = {};

	struct nlattr **tb = info->attrs;

	struct phy_device *phydev;
@@ -132,7 +129,7 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info) 
	/* this values are already validated by the ethnl_pse_set_policy */

	config.admin_cotrol = nla_get_u32(tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL]);



	phydev = dev->phydev;

	phydev = req_info->phydev;

	if (!phydev) {

		NL_SET_ERR_MSG(info->extack, "No PHY is attached");

		return -EOPNOTSUPP;