colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: pre-increment netlink sequence number and add comment

Browse Source 
Pre-increment. That allows to not explicitly initialize nlh_seq_next
in nm_linux_platform_init().
This commit is contained in:
Thomas Haller
2018-03-09 17:44:17 +01:00
committed by Beniamino Galvani
parent d6bbac1b7d
commit e81224824a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/platform/nm-linux-platform.c
View File

@@ -3964,8 +3964,10 @@ cache_on_change (NMPlatform *platform,
static guint32 static guint32
_nlh_seq_next_get (NMLinuxPlatformPrivate *priv) _nlh_seq_next_get (NMLinuxPlatformPrivate *priv)
{ {
/* generate a new sequence number, but skip zero. */ /* generate a new sequence number, but never return zero.
return priv->nlh_seq_next++ ?: priv->nlh_seq_next++; * Wrapping numbers are not a problem, because we don't rely
* on strictly increasing sequence numbers. */
return (++priv->nlh_seq_next) ?: (++priv->nlh_seq_next);
} }
/** /**
@@ -6932,7 +6934,6 @@ nm_linux_platform_init (NMLinuxPlatform *self)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (self); NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (self);
priv->nlh_seq_next = 1;
priv->delayed_action.list_master_connected = g_ptr_array_new (); priv->delayed_action.list_master_connected = g_ptr_array_new ();
priv->delayed_action.list_refresh_link = g_ptr_array_new (); priv->delayed_action.list_refresh_link = g_ptr_array_new ();
priv->delayed_action.list_wait_for_nl_response = g_array_new (FALSE, TRUE, sizeof (DelayedActionWaitForNlResponseData)); priv->delayed_action.list_wait_for_nl_response = g_array_new (FALSE, TRUE, sizeof (DelayedActionWaitForNlResponseData));