diff options
author | Michael Biebl <biebl@debian.org> | 2017-06-17 15:12:08 +0200 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2017-06-17 16:46:42 +0200 |
commit | 3f42ce93c80c6d06d9f55e03500cb5eb4f7f6c27 (patch) | |
tree | 75ee7d82a78589d2c9f7da389f28ea162290e157 | |
parent | 3f7c7487a2240eca32640094ea61f477bbc0b0cb (diff) |
device: capture the IP6 configuration on the IP interface
Fixes a crash with Bluetooth devices where the device is the BlueZ
device and iface stays 0 while the IP interface is the actual BNEP link.
Closes: #864071
-rw-r--r-- | debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch | 26 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch b/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch new file mode 100644 index 000000000..684ea67ad --- /dev/null +++ b/debian/patches/device-capture-the-IP6-configuration-on-the-IP-interface.patch @@ -0,0 +1,26 @@ +From: Lubomir Rintel <lkundrak@v3.sk> +Date: Mon, 22 May 2017 17:04:48 +0200 +Subject: device: capture the IP6 configuration on the IP interface + +Fixes a crash with Bluetooth devices where the device is the BlueZ +device and iface stays 0 while the IP interface is the actual BNEP link. + +https://bugzilla.gnome.org/show_bug.cgi?id=782545 +(cherry picked from commit 30d06b2253b7277ed1153bcbbc81f9e1ca3e3474) +--- + src/devices/nm-device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c +index da581a0..9c46e81 100644 +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -7725,7 +7725,7 @@ act_stage3_ip6_config_start (NMDevice *self, + nm_platform_process_events (nm_device_get_platform (self)); + g_clear_object (&priv->ext_ip6_config_captured); + priv->ext_ip6_config_captured = nm_ip6_config_capture (nm_device_get_platform (self), +- nm_device_get_ifindex (self), ++ nm_device_get_ip_ifindex (self), + FALSE, + NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN); + diff --git a/debian/patches/series b/debian/patches/series index a9be5fd76..d3356ee07 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch systemd-Don-t-enable-NetworkManager-wait-online.serv.patch Fix-iscsiadm-path.patch core-fix-reading-device-state-file.patch +device-capture-the-IP6-configuration-on-the-IP-interface.patch |