From 7ee3abe19bddc44aefaa0bdfa3bf9284ff6f718b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 1 Dec 2011 16:16:00 -0600 Subject: [PATCH] ip6: suppress merge_ip6_configs() warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NetworkManager[815]: merge_ip6_configs: assertion `src != NULL' failed Calling ip6_config_merge_and_apply() with a NULL src_config is fine since that's what happens during RA or DHCP lease changes. Reported by Johannes Sjölund --- src/nm-device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nm-device.c b/src/nm-device.c index e443663407..117ad490b9 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1620,7 +1620,9 @@ ip6_config_merge_and_apply (NMDevice *self, composite = nm_ip6_config_new (); g_assert (composite); - merge_ip6_configs (composite, src_config); + /* Merge in the given config first, if any */ + if (src_config) + merge_ip6_configs (composite, src_config); /* Merge RA and DHCPv6 configs into the composite config */ if (priv->ac_ip6_config && (src_config != priv->ac_ip6_config))