From bf422e972abe9c14b385401ad72b01f3fcef8d40 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 30 Aug 2016 16:37:54 +0200 Subject: [PATCH] libnm: restore verify() comments in team/team-port settings Restore the comments removed in commit a524091966afb884cdb8db48067d5599a685a8eb. (cherry picked from commit d06279f3db794f5c7177d85b4dd5e732d6a90364) --- libnm-core/nm-setting-team-port.c | 3 +++ libnm-core/nm-setting-team.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index 123304fee6..e3ddbdad7c 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -127,6 +127,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } + /* NOTE: normalizable/normalizable-errors must appear at the end with decreasing severity. + * Take care to properly order statements with priv->config above. */ + return TRUE; } diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index df89694f66..5bf11ed921 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -99,6 +99,9 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) } } + /* NOTE: normalizable/normalizable-errors must appear at the end with decreasing severity. + * Take care to properly order statements with priv->config above. */ + return TRUE; }