1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-24 07:02:29 +01:00

Remove pointless assignment in be-ioctl

Set wireless mode before putting interface up.
Put wireless interfaces up before trying to authenticate.
This commit is contained in:
Dan O'Reilly
2009-04-16 21:49:42 -04:00
parent 5e5f73dd3e
commit b82212e9a6
2 changed files with 5 additions and 6 deletions

View File

@@ -407,7 +407,6 @@ class WirelessInterface(Interface, BaseWirelessInterface):
except ValueError:
return False
result = result
if result.endswith("COMPLETED"):
return True
elif result.endswith("DISCONNECTED"):

View File

@@ -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'])