summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2005-03-29 22:15:28 +0000
committerDan Williams <dcbw@redhat.com>2005-03-29 22:15:28 +0000
commit17fd25ccf2448f685a867686d66f6b9c4c07fda0 (patch)
tree22780d93e71d31cfb5ba894652cda61c37b56dc2
parent7142df50e0e834a0f60fd49c0a58f4d635699bf3 (diff)
downloadNetworkManager-17fd25ccf2448f685a867686d66f6b9c4c07fda0.tar.gz
2005-03-29 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.c - (nm_device_set_essid): Work around Orinoco cards which need extra time after setting the ESSID git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@530 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--ChangeLog6
-rw-r--r--src/NetworkManagerDevice.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a61d81c83..c5a040bbec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2005-03-29 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerDevice.c
+ - (nm_device_set_essid): Work around Orinoco cards which need
+ extra time after setting the ESSID
+
+2005-03-29 Dan Williams <dcbw@redhat.com>
+
+ * src/NetworkManagerDevice.c
- Merge one more bit of Peter Jones' completion patch
2005-03-29 Dan Williams <dcbw@redhat.com>
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index a5c292691e..8b5cfed94b 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -948,6 +948,13 @@ void nm_device_set_essid (NMDevice *dev, const char *essid)
nm_warning ("nm_device_set_essid(): error setting ESSID '%s' for device %s. errno = %d", safe_essid, nm_device_get_iface (dev), errno);
close (sk);
+
+ /* Orinoco cards seem to need extra time here to not screw
+ * up the firmware, which reboots when you set the ESSID.
+ * Unfortunately, there's no way to know when the card is back up
+ * again. Sigh...
+ */
+ sleep (2);
}
}