summaryrefslogtreecommitdiffstats
path: root/net/ethtool
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-04-15 15:53:14 -0700
committerDavid S. Miller <davem@davemloft.net>2021-04-15 17:08:29 -0700
commit3d7cc109ecf76afc74f40eb71d5c9baa03c167a3 (patch)
tree36923de86a7e74cb33d8f22426c323b0a105546d /net/ethtool
parentc5797f8a64158f724238d13fa5a4b351b03fe42d (diff)
downloadlinux-3d7cc109ecf76afc74f40eb71d5c9baa03c167a3.tar.gz
linux-3d7cc109ecf76afc74f40eb71d5c9baa03c167a3.tar.bz2
linux-3d7cc109ecf76afc74f40eb71d5c9baa03c167a3.zip
ethtool: fec_prepare_data() - jump to error handling
Refactor fec_prepare_data() a little bit to skip the body of the function and exit on error. Currently the code depends on the fact that we only have one call which may fail between ethnl_ops_begin() and ethnl_ops_complete() and simply saves the error code. This will get hairy with the stats also being queried. No functional changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool')
-rw-r--r--net/ethtool/fec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ethtool/fec.c b/net/ethtool/fec.c
index 31454b9188bd..3e7d091ee7aa 100644
--- a/net/ethtool/fec.c
+++ b/net/ethtool/fec.c
@@ -80,9 +80,8 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base,
if (ret < 0)
return ret;
ret = dev->ethtool_ops->get_fecparam(dev, &fec);
- ethnl_ops_complete(dev);
if (ret)
- return ret;
+ goto out_complete;
WARN_ON_ONCE(fec.reserved);
@@ -98,7 +97,9 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base,
if (data->active_fec == __ETHTOOL_LINK_MODE_MASK_NBITS)
data->active_fec = 0;
- return 0;
+out_complete:
+ ethnl_ops_complete(dev);
+ return ret;
}
static int fec_reply_size(const struct ethnl_req_info *req_base,