diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 13:49:15 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-07-08 13:49:15 -0300 |
| commit | facbf0b9820f34f14b54f567862b4a96e910f468 (patch) | |
| tree | ee65e875e4167dd903f2745cfbf6b2735fd1cd9e /net/ethtool/linkstate.c | |
| parent | 19bf119ccfa071b73a54465e8082ab2c8f8c30eb (diff) | |
| parent | dcde237b9b0eb1d19306e6f48c0a4e058907619f (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/ethtool/linkstate.c')
| -rw-r--r-- | net/ethtool/linkstate.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/ethtool/linkstate.c b/net/ethtool/linkstate.c index 7f47ba89054e..afe5ac8a0f00 100644 --- a/net/ethtool/linkstate.c +++ b/net/ethtool/linkstate.c @@ -78,19 +78,18 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base, ret = linkstate_get_sqi(dev); if (ret < 0 && ret != -EOPNOTSUPP) - return ret; - + goto out; data->sqi = ret; ret = linkstate_get_sqi_max(dev); if (ret < 0 && ret != -EOPNOTSUPP) - return ret; - + goto out; data->sqi_max = ret; + ret = 0; +out: ethnl_ops_complete(dev); - - return 0; + return ret; } static int linkstate_reply_size(const struct ethnl_req_info *req_base, |