From 89d68b1a96b382f692e61b57239baae504e62d04 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 30 Aug 2016 16:20:40 +0200 Subject: [PATCH] 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 (cherry picked from commit 145d199589d34f8844d8e9cafc3c2c2ea8ec4d53) --- src/platform/nm-linux-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index e3ab5e6bca..070a83ea1f 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4070,7 +4070,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); @@ -4078,7 +4078,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