ethtool: pse-pd: Fix double word in comments

[linux-block.git] / net / ethtool / wol.c

diff --git a/net/ethtool/wol.c b/net/ethtool/wol.c
index 88f435e76481d780f531c0e1eda5d29c4ae25a10..a4a43d9e6e9d5f9385aa6c2997736a62ca9fe79e 100644 (file)
--- a/net/ethtool/wol.c
+++ b/net/ethtool/wol.c
@@ -82,18 +82,6 @@ static int wol_fill_reply(struct sk_buff *skb,
        return 0;
 }
 
-const struct ethnl_request_ops ethnl_wol_request_ops = {
-       .request_cmd            = ETHTOOL_MSG_WOL_GET,
-       .reply_cmd              = ETHTOOL_MSG_WOL_GET_REPLY,
-       .hdr_attr               = ETHTOOL_A_WOL_HEADER,
-       .req_info_size          = sizeof(struct wol_req_info),
-       .reply_data_size        = sizeof(struct wol_reply_data),
-
-       .prepare_data           = wol_prepare_data,
-       .reply_size             = wol_reply_size,
-       .fill_reply             = wol_fill_reply,
-};
-
 /* WOL_SET */
 
 const struct nla_policy ethnl_wol_set_policy[] = {
@@ -104,67 +92,66 @@ const struct nla_policy ethnl_wol_set_policy[] = {
                                            .len = SOPASS_MAX },
 };
 
-int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info)
+static int
+ethnl_set_wol_validate(struct ethnl_req_info *req_info, struct genl_info *info)
+{
+       const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
+
+       return ops->get_wol && ops->set_wol ? 1 : -EOPNOTSUPP;
+}
+
+static int
+ethnl_set_wol(struct ethnl_req_info *req_info, struct genl_info *info)
 {
        struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
-       struct ethnl_req_info req_info = {};
+       struct net_device *dev = req_info->dev;
        struct nlattr **tb = info->attrs;
-       struct net_device *dev;
        bool mod = false;
        int ret;
 
-       ret = ethnl_parse_header_dev_get(&req_info, tb[ETHTOOL_A_WOL_HEADER],
-                                        genl_info_net(info), info->extack,
-                                        true);
-       if (ret < 0)
-               return ret;
-       dev = req_info.dev;
-       ret = -EOPNOTSUPP;
-       if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)
-               goto out_dev;
-
-       rtnl_lock();
-       ret = ethnl_ops_begin(dev);
-       if (ret < 0)
-               goto out_rtnl;
-
        dev->ethtool_ops->get_wol(dev, &wol);
        ret = ethnl_update_bitset32(&wol.wolopts, WOL_MODE_COUNT,
                                    tb[ETHTOOL_A_WOL_MODES], wol_mode_names,
                                    info->extack, &mod);
        if (ret < 0)
-               goto out_ops;
+               return ret;
        if (wol.wolopts & ~wol.supported) {
                NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_WOL_MODES],
                                    "cannot enable unsupported WoL mode");
-               ret = -EINVAL;
-               goto out_ops;
+               return -EINVAL;
        }
        if (tb[ETHTOOL_A_WOL_SOPASS]) {
                if (!(wol.supported & WAKE_MAGICSECURE)) {
                        NL_SET_ERR_MSG_ATTR(info->extack,
                                            tb[ETHTOOL_A_WOL_SOPASS],
                                            "magicsecure not supported, cannot set password");
-                       ret = -EINVAL;
-                       goto out_ops;
+                       return -EINVAL;
                }
                ethnl_update_binary(wol.sopass, sizeof(wol.sopass),
                                    tb[ETHTOOL_A_WOL_SOPASS], &mod);
        }
 
        if (!mod)
-               goto out_ops;
+               return 0;
        ret = dev->ethtool_ops->set_wol(dev, &wol);
        if (ret)
-               goto out_ops;
+               return ret;
        dev->wol_enabled = !!wol.wolopts;
-       ethtool_notify(dev, ETHTOOL_MSG_WOL_NTF, NULL);
-
-out_ops:
-       ethnl_ops_complete(dev);
-out_rtnl:
-       rtnl_unlock();
-out_dev:
-       ethnl_parse_header_dev_put(&req_info);
-       return ret;
+       return 1;
 }
+
+const struct ethnl_request_ops ethnl_wol_request_ops = {
+       .request_cmd            = ETHTOOL_MSG_WOL_GET,
+       .reply_cmd              = ETHTOOL_MSG_WOL_GET_REPLY,
+       .hdr_attr               = ETHTOOL_A_WOL_HEADER,
+       .req_info_size          = sizeof(struct wol_req_info),
+       .reply_data_size        = sizeof(struct wol_reply_data),
+
+       .prepare_data           = wol_prepare_data,
+       .reply_size             = wol_reply_size,
+       .fill_reply             = wol_fill_reply,
+
+       .set_validate           = ethnl_set_wol_validate,
+       .set                    = ethnl_set_wol,
+       .set_ntf_cmd            = ETHTOOL_MSG_WOL_NTF,
+};