ethtool: rename ethnl_parse_header() to ethnl_parse_header_dev_get()

Andrew Lunn pointed out that even if it's documented that
ethnl_parse_header() takes reference to network device if it fills it
into the target structure, its name doesn't make it apparent so that
corresponding dev_put() looks like mismatched.

Rename the function ethnl_parse_header_dev_get() to indicate that it
takes a reference.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethtool/debug.c b/net/ethtool/debug.c
index aaef4843e6baffb669267ef89c06a4850c87578d..87f288ee20c8ce31c8206c938bb3a0e271efa572 100644 (file)
--- a/net/ethtool/debug.c
+++ b/net/ethtool/debug.c
@@ -102,8 +102,10 @@ int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info)
                          info->extack);
        if (ret < 0)
                return ret;
-       ret = ethnl_parse_header(&req_info, tb[ETHTOOL_A_DEBUG_HEADER],
-                                genl_info_net(info), info->extack, true);
+       ret = ethnl_parse_header_dev_get(&req_info,
+                                        tb[ETHTOOL_A_DEBUG_HEADER],
+                                        genl_info_net(info), info->extack,
+                                        true);
        if (ret < 0)
                return ret;
        dev = req_info.dev;

diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c
index 5d16cb4e8693d0b70666639c41b63a718e2f62c8..2df420068cbbb95359d3d0d86f902cbdf30067b7 100644 (file)
--- a/net/ethtool/linkinfo.c
+++ b/net/ethtool/linkinfo.c
@@ -121,8 +121,10 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info)
                          info->extack);
        if (ret < 0)
                return ret;
-       ret = ethnl_parse_header(&req_info, tb[ETHTOOL_A_LINKINFO_HEADER],
-                                genl_info_net(info), info->extack, true);
+       ret = ethnl_parse_header_dev_get(&req_info,
+                                        tb[ETHTOOL_A_LINKINFO_HEADER],
+                                        genl_info_net(info), info->extack,
+                                        true);
        if (ret < 0)
                return ret;
        dev = req_info.dev;

diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c
index f049b97072fe4df4659cd46a923db68437f3783f..cb29cc8c5960f7e27bd2090637d4c0f81dfeb193 100644 (file)
--- a/net/ethtool/linkmodes.c
+++ b/net/ethtool/linkmodes.c
@@ -334,8 +334,10 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info)
                          info->extack);
        if (ret < 0)
                return ret;
-       ret = ethnl_parse_header(&req_info, tb[ETHTOOL_A_LINKMODES_HEADER],
-                                genl_info_net(info), info->extack, true);
+       ret = ethnl_parse_header_dev_get(&req_info,
+                                        tb[ETHTOOL_A_LINKMODES_HEADER],
+                                        genl_info_net(info), info->extack,
+                                        true);
        if (ret < 0)
                return ret;
        dev = req_info.dev;

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 180c194fab0768848b14ee58f488257ff06c4c5d..8eca55122ef36a8f7389a8509c1bc6de22ca5bb8 100644 (file)
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -18,7 +18,7 @@ static const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_MAX + 1] = {
 };
 
 /**
- * ethnl_parse_header() - parse request header
+ * ethnl_parse_header_dev_get() - parse request header
  * @req_info:    structure to put results into
  * @header:      nest attribute with request header
  * @net:         request netns
@@ -33,9 +33,9 @@ static const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_MAX + 1] = {
  *
  * Return: 0 on success or negative error code
  */
-int ethnl_parse_header(struct ethnl_req_info *req_info,
-                      const struct nlattr *header, struct net *net,
-                      struct netlink_ext_ack *extack, bool require_dev)
+int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,
+                              const struct nlattr *header, struct net *net,
+                              struct netlink_ext_ack *extack, bool require_dev)
 {
        struct nlattr *tb[ETHTOOL_A_HEADER_MAX + 1];
        const struct nlattr *devname_attr;
@@ -253,8 +253,8 @@ static int ethnl_default_parse(struct ethnl_req_info *req_info,
                          request_ops->request_policy, extack);
        if (ret < 0)
                goto out;
-       ret = ethnl_parse_header(req_info, tb[request_ops->hdr_attr], net,
-                                extack, require_dev);
+       ret = ethnl_parse_header_dev_get(req_info, tb[request_ops->hdr_attr],
+                                        net, extack, require_dev);
        if (ret < 0)
                goto out;
 

diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h
index 60efd87686ad0b6e9f11bd30a226ce47c6adb0f1..9617082900745156bd8566fe9a3c98e96d3e4887 100644 (file)
--- a/net/ethtool/netlink.h
+++ b/net/ethtool/netlink.h
@@ -10,9 +10,10 @@
 
 struct ethnl_req_info;
 
-int ethnl_parse_header(struct ethnl_req_info *req_info,
-                      const struct nlattr *nest, struct net *net,
-                      struct netlink_ext_ack *extack, bool require_dev);
+int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,
+                              const struct nlattr *nest, struct net *net,
+                              struct netlink_ext_ack *extack,
+                              bool require_dev);
 int ethnl_fill_reply_header(struct sk_buff *skb, struct net_device *dev,
                            u16 attrtype);
 struct sk_buff *ethnl_reply_init(size_t payload, struct net_device *dev, u8 cmd,

diff --git a/net/ethtool/wol.c b/net/ethtool/wol.c
index e1b8a65b64c4ba10333b0d418a586dedafcae8e6..1d2bcabee5546259e9db872a41a73290bbddbec1 100644 (file)
--- a/net/ethtool/wol.c
+++ b/net/ethtool/wol.c
@@ -123,8 +123,9 @@ int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info)
                          wol_set_policy, info->extack);
        if (ret < 0)
                return ret;
-       ret = ethnl_parse_header(&req_info, tb[ETHTOOL_A_WOL_HEADER],
-                                genl_info_net(info), info->extack, true);
+       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;