diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-08-28 13:52:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-08-29 11:30:50 +0200 |
| commit | 3dc09446771a3434ed948bdd5e6ca9f6ef9a9e76 (patch) | |
| tree | 816a02c719c5a6d26cd098ebf51c03c1368489b4 | |
| parent | 895c61a742eb1d816b022c260494f5632bd7a922 (diff) | |
| download | NetworkManager-3dc09446771a3434ed948bdd5e6ca9f6ef9a9e76.tar.gz | |
platform: split processing result from do_change_link()
| -rw-r--r-- | src/platform/nm-linux-platform.c | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 67443aa853..338708a552 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -4061,18 +4061,14 @@ out: return !!nmp_cache_lookup_obj (priv->cache, obj_id); } -static NMPlatformError -do_change_link (NMPlatform *platform, - int ifindex, - struct nl_msg *nlmsg) +static WaitForNlResponseResult +do_change_link_request (NMPlatform *platform, + int ifindex, + struct nl_msg *nlmsg) { nm_auto_pop_netns NMPNetns *netns = NULL; WaitForNlResponseResult seq_result = WAIT_FOR_NL_RESPONSE_RESULT_UNKNOWN; int nle; - char s_buf[256]; - NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS; - NMLogLevel log_level = LOGL_DEBUG; - const char *log_result = "failure", *log_detail = ""; if (!nm_platform_netns_push (platform, &netns)) return NM_PLATFORM_ERROR_UNSPECIFIED; @@ -4099,6 +4095,18 @@ retry: nlmsg_hdr (nlmsg)->nlmsg_type = RTM_SETLINK; goto retry; } + return seq_result; +} + +static NMPlatformError +do_change_link_result (NMPlatform *platform, + int ifindex, + WaitForNlResponseResult seq_result) +{ + char s_buf[256]; + NMPlatformError result = NM_PLATFORM_ERROR_SUCCESS; + NMLogLevel log_level = LOGL_DEBUG; + const char *log_result = "failure", *log_detail = ""; if (seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK) { log_result = "success"; @@ -4124,6 +4132,17 @@ retry: return result; } +static NMPlatformError +do_change_link (NMPlatform *platform, + int ifindex, + struct nl_msg *nlmsg) +{ + WaitForNlResponseResult seq_result; + + seq_result = do_change_link_request (platform, ifindex, nlmsg); + return do_change_link_result (platform, ifindex, seq_result); +} + static gboolean link_add (NMPlatform *platform, const char *name, |