summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-02-12 16:41:51 +0100
committerThomas Haller <thaller@redhat.com>2016-02-16 11:35:50 +0100
commitd34d4b1da036870f06a842353ffb72e322abe157 (patch)
tree2baf09da92e823ac4a3c749a2f0c5ae8b231985e
parentcaa332556268d095f0fc95c2c0486a9df43c94a6 (diff)
downloadNetworkManager-d34d4b1da036870f06a842353ffb72e322abe157.tar.gz
platform: during @abort_parsing goto stop in event_handler_recvmsgs()th/platform-recvmsgs-fixes-bgo761959
Now, that we no longer overwrite @err, we can jump to stop: instead of out:.
-rw-r--r--src/platform/nm-linux-platform.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index a5b277d6a5..f442f88b6a 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -5699,11 +5699,8 @@ continue_reading:
event_seq_check (platform, msg, seq_result);
- if (abort_parsing) {
- if (!handle_events)
- goto continue_reading;
- goto out;
- }
+ if (abort_parsing)
+ goto stop;
err = 0;
hdr = nlmsg_next (hdr, &n);