fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-11 23:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ip6: suppress merge_ip6_configs() warning

Browse source 
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
This commit is contained in:
Dan Williams 2011-12-01 16:16:00 -06:00
parent fc7941032f
commit 7ee3abe19b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nm-device.c
View file

@ -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))