gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-19 00:15:47 +01:00
Code Issues Projects Releases Wiki Activity

Remove pointless assignment in be-ioctl

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
wicd/backends/be-ioctl.py
View File

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

10
wicd/networking.py
View File

@@ -831,17 +831,17 @@ class WirelessConnectThread(ConnectThread):
self.reset_ip_addresses(wiface) self.reset_ip_addresses(wiface)
self.stop_wpa(wiface) self.stop_wpa(wiface)
self.flush_routes(wiface) self.flush_routes(wiface)
wiface.SetMode(self.network['mode'])
# Generate PSK and authenticate if needed.
if self.wpa_driver != 'ralink legacy':
self.generate_psk_and_authenticate(wiface)
# Put interface up. # Put interface up.
self.SetStatus('configuring_interface') self.SetStatus('configuring_interface')
self.put_iface_up(wiface) self.put_iface_up(wiface)
# Generate PSK and authenticate if needed.
if self.wpa_driver != 'ralink legacy':
self.generate_psk_and_authenticate(wiface)
# Associate. # Associate.
wiface.SetMode(self.network['mode'])
wiface.Associate(self.network['essid'], self.network['channel'], wiface.Associate(self.network['essid'], self.network['channel'],
self.network['bssid']) self.network['bssid'])