f2c63ab9e0
- Fix perpetual credentials request with private key passwords in the applet - Sleep a bit before activating wireless cards to work around driver bugs
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
Index: src/nm-device-802-3-ethernet.c
|
|
===================================================================
|
|
--- src/nm-device-802-3-ethernet.c (revision 2577)
|
|
+++ src/nm-device-802-3-ethernet.c (revision 2578)
|
|
@@ -108,18 +108,16 @@
|
|
GObject *obj,
|
|
NMDevice8023Ethernet *self)
|
|
{
|
|
+ GSource * source;
|
|
+
|
|
/* Make sure signal is for us */
|
|
if (NM_DEVICE (self) != NM_DEVICE (obj))
|
|
return;
|
|
|
|
- if (!nm_device_has_active_link (NM_DEVICE (self)))
|
|
- {
|
|
- GSource * source = g_idle_source_new ();
|
|
-
|
|
- g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL);
|
|
- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
|
|
- g_source_unref (source);
|
|
- }
|
|
+ source = g_idle_source_new ();
|
|
+ g_source_set_callback (source, (GSourceFunc) link_activated_helper, self, NULL);
|
|
+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
|
|
+ g_source_unref (source);
|
|
}
|
|
|
|
|
|
@@ -135,18 +133,16 @@
|
|
GObject *obj,
|
|
NMDevice8023Ethernet *self)
|
|
{
|
|
+ GSource * source;
|
|
+
|
|
/* Make sure signal is for us */
|
|
if (NM_DEVICE (self) != NM_DEVICE (obj))
|
|
return;
|
|
|
|
- if (nm_device_has_active_link (NM_DEVICE (self)))
|
|
- {
|
|
- GSource * source = g_idle_source_new ();
|
|
-
|
|
- g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL);
|
|
- g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
|
|
- g_source_unref (source);
|
|
- }
|
|
+ source = g_idle_source_new ();
|
|
+ g_source_set_callback (source, (GSourceFunc) link_deactivated_helper, self, NULL);
|
|
+ g_source_attach (source, nm_device_get_main_context (NM_DEVICE (self)));
|
|
+ g_source_unref (source);
|
|
}
|
|
|
|
static void
|