kevin/linux
1
Fork 0
Code

ethtool: Don't check for NULL info in prepare_data callbacks

Browse Source 
Since commit f946270d05 ("ethtool: netlink: always pass genl_info to
.prepare_data") the info argument of prepare_data callbacks is never
NULL. Remove checks present in callback implementations.

Link: https://lore.kernel.org/netdev/20240703121237.3f8b9125@kernel.org/
Signed-off-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20240731-prepare_data-null-check-v1-1-627f2320678f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Simon Horman 2024-07-31 10:15:28 +01:00 committed by Jakub Kicinski
parent f9c141fc33
commit 743ff02152
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ethtool/linkinfo.c
View File

@ -35,7 +35,7 @@ static int linkinfo_prepare_data(const struct ethnl_req_info *req_base,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = __ethtool_get_link_ksettings(dev, &data->ksettings); ret = __ethtool_get_link_ksettings(dev, &data->ksettings);
if (ret < 0 && info) if (ret < 0)
GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
ethnl_ops_complete(dev); ethnl_ops_complete(dev);

2
net/ethtool/linkmodes.c
View File

@ -40,7 +40,7 @@ static int linkmodes_prepare_data(const struct ethnl_req_info *req_base,
return ret; return ret;
ret = __ethtool_get_link_ksettings(dev, &data->ksettings); ret = __ethtool_get_link_ksettings(dev, &data->ksettings);
if (ret < 0 && info) { if (ret < 0) {
GENL_SET_ERR_MSG(info, "failed to retrieve link settings"); GENL_SET_ERR_MSG(info, "failed to retrieve link settings");
goto out; goto out;
} }

3
net/ethtool/strset.c
View File

@ -289,8 +289,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
for (i = 0; i < ETH_SS_COUNT; i++) { for (i = 0; i < ETH_SS_COUNT; i++) {
if ((req_info->req_ids & (1U << i)) && if ((req_info->req_ids & (1U << i)) &&
data->sets[i].per_dev) { data->sets[i].per_dev) {
if (info) GENL_SET_ERR_MSG(info, "requested per device strings without dev");
GENL_SET_ERR_MSG(info, "requested per device strings without dev");
return -EINVAL; return -EINVAL;
} }
} }