diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index ed7dc3f..3d16486 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -407,7 +407,6 @@ class WirelessInterface(Interface, BaseWirelessInterface): except ValueError: return False - result = result if result.endswith("COMPLETED"): return True elif result.endswith("DISCONNECTED"): diff --git a/wicd/networking.py b/wicd/networking.py index 084b8e3..1260505 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -831,17 +831,17 @@ class WirelessConnectThread(ConnectThread): self.reset_ip_addresses(wiface) self.stop_wpa(wiface) self.flush_routes(wiface) - - # Generate PSK and authenticate if needed. - if self.wpa_driver != 'ralink legacy': - self.generate_psk_and_authenticate(wiface) + wiface.SetMode(self.network['mode']) # Put interface up. self.SetStatus('configuring_interface') self.put_iface_up(wiface) + # Generate PSK and authenticate if needed. + if self.wpa_driver != 'ralink legacy': + self.generate_psk_and_authenticate(wiface) + # Associate. - wiface.SetMode(self.network['mode']) wiface.Associate(self.network['essid'], self.network['channel'], self.network['bssid'])