Commit 3d7cc109 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5797f8a
...@@ -80,9 +80,8 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base, ...@@ -80,9 +80,8 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = dev->ethtool_ops->get_fecparam(dev, &fec); ret = dev->ethtool_ops->get_fecparam(dev, &fec);
ethnl_ops_complete(dev);
if (ret) if (ret)
return ret; goto out_complete;
WARN_ON_ONCE(fec.reserved); WARN_ON_ONCE(fec.reserved);
...@@ -98,7 +97,9 @@ static int fec_prepare_data(const struct ethnl_req_info *req_base, ...@@ -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) if (data->active_fec == __ETHTOOL_LINK_MODE_MASK_NBITS)
data->active_fec = 0; 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, static int fec_reply_size(const struct ethnl_req_info *req_base,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment