fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 10:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: refactor calling event_seq_check()

Browse source 
This makes more sense with the next commit.
This commit is contained in:
Thomas Haller 2016-04-07 21:19:45 +02:00
parent 90550a276b
commit 8bf635af0e
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/platform/nm-linux-platform.c
View file

@ -3468,15 +3468,12 @@ do_request_one_type (NMPlatform *platform, NMPObjectType obj_type)
}
static void
event_seq_check (NMPlatform *platform, struct nl_msg *msg, WaitForNlResponseResult seq_result)
event_seq_check (NMPlatform *platform, guint32 seq_number, WaitForNlResponseResult seq_result)
{
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
DelayedActionWaitForNlResponseData *data;
guint32 seq_number;
guint i;
seq_number = nlmsg_hdr (msg)->nlmsg_seq;
if (seq_number == 0)
return;
@ -5655,6 +5652,8 @@ continue_reading:
while (nlmsg_ok (hdr, n)) {
nm_auto_nlmsg struct nl_msg *msg = NULL;
gboolean abort_parsing = FALSE;
gboolean process_valid_msg = FALSE;
guint32 seq_number;
msg = nlmsg_convert (hdr);
if (!msg) {
@ -5739,7 +5738,12 @@ continue_reading:
seq_result = -errsv;
} else
seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
} else {
} else
process_valid_msg = TRUE;
seq_number = nlmsg_hdr (msg)->nlmsg_seq;
if (process_valid_msg) {
/* Valid message (not checking for MULTIPART bit to
* get along with broken kernels. NL_SKIP has no
* effect on this. */
@ -5749,7 +5753,7 @@ continue_reading:
seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
}
event_seq_check (platform, msg, seq_result);
event_seq_check (platform, seq_number, seq_result);
if (abort_parsing)
goto stop;