summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-08-30 16:20:40 +0200
committerThomas Haller <thaller@redhat.com>2016-08-30 16:22:42 +0200
commit145d199589d34f8844d8e9cafc3c2c2ea8ec4d53 (patch)
treee912fa861b6e6f86cc735916d6221137a317ca49
parent02fb3eff481f79d3caa67fdde20b2ae7aa5e640b (diff)
downloadNetworkManager-145d199589d34f8844d8e9cafc3c2c2ea8ec4d53.tar.gz
platform: fix return value for error case in do_change_link_request()
There is a "goto retry" in do_change_link_request(), at that point, seq_result has the value -EOPNOTSUPP, instead of WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN. Fixes: 02fb3eff481f79d3caa67fdde20b2ae7aa5e640b
-rw-r--r--src/platform/nm-linux-platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index d5e6c2900f..c30eed9447 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -4071,7 +4071,7 @@ do_change_link_request (NMPlatform *platform,
int nle;
if (!nm_platform_netns_push (platform, &netns))
- return seq_result;
+ return WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN;
retry:
nle = _nl_send_auto_with_seq (platform, nlmsg, &seq_result, NULL);
@@ -4079,7 +4079,7 @@ retry:
_LOGE ("do-change-link[%d]: failure sending netlink request \"%s\" (%d)",
ifindex,
nl_geterror (nle), -nle);
- return seq_result;
+ return WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN;
}
/* always refetch the link after changing it. There seems to be issues