ethtool: pse-pd: Fix double word in comments

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

diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c
index e2be9e89c9d956e1007e5117d09a9e37b1ace7c4..6657d0b888d83a0cc4c02254aaafc1f9bd43b0bf 100644 (file)
--- a/net/ethtool/pause.c
+++ b/net/ethtool/pause.c
@@ -54,9 +54,9 @@ static int pause_prepare_data(const struct ethnl_req_info *req_base,
                              struct genl_info *info)
 {
        const struct pause_req_info *req_info = PAUSE_REQINFO(req_base);
+       struct netlink_ext_ack *extack = info ? info->extack : NULL;
        struct pause_reply_data *data = PAUSE_REPDATA(reply_base);
        enum ethtool_mac_stats_src src = req_info->src;
-       struct netlink_ext_ack *extack = info->extack;
        struct net_device *dev = reply_base->dev;
        int ret;
 
@@ -161,19 +161,6 @@ static int pause_fill_reply(struct sk_buff *skb,
        return 0;
 }
 
-const struct ethnl_request_ops ethnl_pause_request_ops = {
-       .request_cmd            = ETHTOOL_MSG_PAUSE_GET,
-       .reply_cmd              = ETHTOOL_MSG_PAUSE_GET_REPLY,
-       .hdr_attr               = ETHTOOL_A_PAUSE_HEADER,
-       .req_info_size          = sizeof(struct pause_req_info),
-       .reply_data_size        = sizeof(struct pause_reply_data),
-
-       .parse_request          = pause_parse_request,
-       .prepare_data           = pause_prepare_data,
-       .reply_size             = pause_reply_size,
-       .fill_reply             = pause_fill_reply,
-};
-
 /* PAUSE_SET */
 
 const struct nla_policy ethnl_pause_set_policy[] = {
@@ -184,51 +171,49 @@ const struct nla_policy ethnl_pause_set_policy[] = {
        [ETHTOOL_A_PAUSE_TX]                    = { .type = NLA_U8 },
 };
 
-int ethnl_set_pause(struct sk_buff *skb, struct genl_info *info)
+static int
+ethnl_set_pause_validate(struct ethnl_req_info *req_info,
+                        struct genl_info *info)
+{
+       const struct ethtool_ops *ops = req_info->dev->ethtool_ops;
+
+       return ops->get_pauseparam && ops->set_pauseparam ? 1 : -EOPNOTSUPP;
+}
+
+static int
+ethnl_set_pause(struct ethnl_req_info *req_info, struct genl_info *info)
 {
+       struct net_device *dev = req_info->dev;
        struct ethtool_pauseparam params = {};
-       struct ethnl_req_info req_info = {};
        struct nlattr **tb = info->attrs;
-       const struct ethtool_ops *ops;
-       struct net_device *dev;
        bool mod = false;
        int ret;
 
-       ret = ethnl_parse_header_dev_get(&req_info,
-                                        tb[ETHTOOL_A_PAUSE_HEADER],
-                                        genl_info_net(info), info->extack,
-                                        true);
-       if (ret < 0)
-               return ret;
-       dev = req_info.dev;
-       ops = dev->ethtool_ops;
-       ret = -EOPNOTSUPP;
-       if (!ops->get_pauseparam || !ops->set_pauseparam)
-               goto out_dev;
-
-       rtnl_lock();
-       ret = ethnl_ops_begin(dev);
-       if (ret < 0)
-               goto out_rtnl;
-       ops->get_pauseparam(dev, &params);
+       dev->ethtool_ops->get_pauseparam(dev, &params);
 
        ethnl_update_bool32(&params.autoneg, tb[ETHTOOL_A_PAUSE_AUTONEG], &mod);
        ethnl_update_bool32(&params.rx_pause, tb[ETHTOOL_A_PAUSE_RX], &mod);
        ethnl_update_bool32(&params.tx_pause, tb[ETHTOOL_A_PAUSE_TX], &mod);
-       ret = 0;
        if (!mod)
-               goto out_ops;
+               return 0;
 
        ret = dev->ethtool_ops->set_pauseparam(dev, &params);
-       if (ret < 0)
-               goto out_ops;
-       ethtool_notify(dev, ETHTOOL_MSG_PAUSE_NTF, NULL);
-
-out_ops:
-       ethnl_ops_complete(dev);
-out_rtnl:
-       rtnl_unlock();
-out_dev:
-       ethnl_parse_header_dev_put(&req_info);
-       return ret;
+       return ret < 0 ? ret : 1;
 }
+
+const struct ethnl_request_ops ethnl_pause_request_ops = {
+       .request_cmd            = ETHTOOL_MSG_PAUSE_GET,
+       .reply_cmd              = ETHTOOL_MSG_PAUSE_GET_REPLY,
+       .hdr_attr               = ETHTOOL_A_PAUSE_HEADER,
+       .req_info_size          = sizeof(struct pause_req_info),
+       .reply_data_size        = sizeof(struct pause_reply_data),
+
+       .parse_request          = pause_parse_request,
+       .prepare_data           = pause_prepare_data,
+       .reply_size             = pause_reply_size,
+       .fill_reply             = pause_fill_reply,
+
+       .set_validate           = ethnl_set_pause_validate,
+       .set                    = ethnl_set_pause,
+       .set_ntf_cmd            = ETHTOOL_MSG_PAUSE_NTF,
+};