62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
|
From 7851f1c5958599bfe38beac806cec1f42f1ba114 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||
|
|
Date: Tue, 23 May 2017 11:28:08 +0200
|
||
|
|
Subject: [PATCH] bluetooth: unhook adapter properties callback when the
|
||
|
|
adapter vanishes
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1454654
|
||
|
|
(cherry picked from commit 0aa2e0bad31d7102034952cf95b6d43829c91d30)
|
||
|
|
---
|
||
|
|
src/devices/bluetooth/nm-bluez-device.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
|
||
|
|
index ebfa0d647..41ef74cae 100644
|
||
|
|
--- a/src/devices/bluetooth/nm-bluez-device.c
|
||
|
|
+++ b/src/devices/bluetooth/nm-bluez-device.c
|
||
|
|
@@ -1187,7 +1187,11 @@ dispose (GObject *object)
|
||
|
|
g_slist_free_full (priv->connections, g_object_unref);
|
||
|
|
priv->connections = NULL;
|
||
|
|
|
||
|
|
- g_clear_object (&priv->adapter5);
|
||
|
|
+ if (priv->adapter5) {
|
||
|
|
+ g_signal_handlers_disconnect_by_func (priv->adapter5, adapter5_on_properties_changed, self);
|
||
|
|
+ g_clear_object (&priv->adapter5);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
g_clear_object (&priv->dbus_connection);
|
||
|
|
|
||
|
|
G_OBJECT_CLASS (nm_bluez_device_parent_class)->dispose (object);
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|
||
|
|
From 30d06b2253b7277ed1153bcbbc81f9e1ca3e3474 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||
|
|
Date: Mon, 22 May 2017 17:04:48 +0200
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
---
|
||
|
|
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 ed6aa0e16..8473364a3 100644
|
||
|
|
--- a/src/devices/nm-device.c
|
||
|
|
+++ b/src/devices/nm-device.c
|
||
|
|
@@ -7702,7 +7702,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);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|