Skip to content

Commit

Permalink
net: phy: Send notifier when starting the cable test
Browse files Browse the repository at this point in the history
Given that it takes time to run a cable test, send a notify message at
the start, as well as when it is completed.

v3:
EMSGSIZE when ethnl_bcastmsg_put() fails
Print an error message on failure, since this is a void function.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Andrew Lunn authored and Jakub Kicinski committed May 10, 2020
1 parent 4a459bd commit 9896a45
Showing 1 changed file with 41 additions and 0 deletions.
41 changes: 41 additions & 0 deletions net/ethtool/cabletest.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,43 @@ cable_test_act_policy[ETHTOOL_A_CABLE_TEST_MAX + 1] = {
[ETHTOOL_A_CABLE_TEST_HEADER] = { .type = NLA_NESTED },
};

static int ethnl_cable_test_started(struct phy_device *phydev)
{
struct sk_buff *skb;
int err = -ENOMEM;
void *ehdr;

skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
if (!skb)
goto out;

ehdr = ethnl_bcastmsg_put(skb, ETHTOOL_MSG_CABLE_TEST_NTF);
if (!ehdr) {
err = -EMSGSIZE;
goto out;
}

err = ethnl_fill_reply_header(skb, phydev->attached_dev,
ETHTOOL_A_CABLE_TEST_NTF_HEADER);
if (err)
goto out;

err = nla_put_u8(skb, ETHTOOL_A_CABLE_TEST_NTF_STATUS,
ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED);
if (err)
goto out;

genlmsg_end(skb, ehdr);

return ethnl_multicast(skb, phydev->attached_dev);

out:
nlmsg_free(skb);
phydev_err(phydev, "%s: Error %pe\n", __func__, ERR_PTR(err));

return err;
}

int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
{
struct nlattr *tb[ETHTOOL_A_CABLE_TEST_MAX + 1];
Expand Down Expand Up @@ -47,6 +84,10 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
ret = phy_start_cable_test(dev->phydev, info->extack);

ethnl_ops_complete(dev);

if (!ret)
ethnl_cable_test_started(dev->phydev);

out_rtnl:
rtnl_unlock();
out_dev_put:
Expand Down

0 comments on commit 9896a45

Please sign in to comment.