-support new zydas driver

diff --git a/wirelesslan/src/Wlan.py b/wirelesslan/src/Wlan.py
index 8f8d927..2e5ac55 100644 (file)
--- a/wirelesslan/src/Wlan.py
+++ b/wirelesslan/src/Wlan.py
@@ -237,7 +237,7 @@ class wpaSupplicant:
                        fp.write('ctrl_interface=/var/run/wpa_supplicant\n')
                        fp.write('ctrl_interface_group=0\n')
                        fp.write('eapol_version=1\n')
-                       fp.write('ap_scan=1\n')
+                       fp.write('ap_scan=2\n')
                        fp.write('fast_reauth=1\n')                     
                        fp.write('network={\n')
                        fp.write('\tssid="'+essid+'"\n')

diff --git a/wirelesslan/src/plugin.py b/wirelesslan/src/plugin.py
index 5b9be9c..653ddef 100644 (file)
--- a/wirelesslan/src/plugin.py
+++ b/wirelesslan/src/plugin.py
@@ -250,15 +250,7 @@ def configStrings(iface):
        if driver == 'madwifi':
                return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dmadwifi\n   post-down killall -q wpa_supplicant"
        if driver == 'zydas':
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B\n     post-down killall -q wpa_supplicant"
-
-       """ret=system("dmesg | grep \"rt73: using permanent MAC addr\"")
-       ret2=system("dmesg | grep \"rt73: using net dev supplied MAC addr\"")
-       if ret == 0 or ret2 == 0:
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dralink\n    post-down killall -q wpa_supplicant"
-       else:
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B\n     post-down killall -q wpa_supplicant"
-       """
+               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dzydas\n     post-down killall -q wpa_supplicant"
 
 def Plugins(**kwargs):
        return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "menuEntryName": lambda x: "Wireless Network Configuartion..."})