diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-02-12 17:19:34 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-02-12 17:22:21 +0100 |
| commit | b9bb1c793de7d1f4d194292338f28080de5d1ffb (patch) | |
| tree | efddc15bdb30b58610797f1de8faec20ef679ba0 | |
| parent | 89e806e1a63fb57e875a0e7051877de436dd2e00 (diff) | |
| download | NetworkManager-b9bb1c793de7d1f4d194292338f28080de5d1ffb.tar.gz | |
device/vlan: check existence of ip6 configuration before reapplying it
The connection might not have an ipv6 configuration, check for this
before calling nm_device_reactivate_ip6_config().
Fixes: 45b77dbcfce5188dc117c886e8be70ace72a4bc7
https://bugzilla.redhat.com/show_bug.cgi?id=1307070
| -rw-r--r-- | src/devices/nm-device-vlan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 2c48f5b2f7..ac8808c918 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -115,7 +115,8 @@ parent_hwaddr_changed (NMDevice *parent, * removing the IPv6 configuration; reapply it. */ s_ip6 = nm_connection_get_setting_ip6_config (connection); - nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6); + if (s_ip6) + nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6); } } } |