add second tty to initab again. kernel patch verified to work on asus wl500gx.

[openwrt.git] / openwrt / package / wificonf / wificonf.c

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index b76f697..5feab6e 100644 (file)
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -176,6 +176,8 @@ void setup_bcom(int skfd, char *ifname)
        if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
                return;
        
        if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
                return;
        

+       nvram_set(wl_var("ifname"), ifname);
+       

        stop_bcom(skfd, ifname);
 
        /* Set Country */
        stop_bcom(skfd, ifname);
 
        /* Set Country */


@@ -323,7 +325,7 @@ void setup_bcom(int skfd, char *ifname)
                        val = TKIP_ENABLED;
                else if (nvram_match(wl_var("crypto"), "aes"))
                        val = AES_ENABLED;
                        val = TKIP_ENABLED;
                else if (nvram_match(wl_var("crypto"), "aes"))
                        val = AES_ENABLED;

-               else if (nvram_match(wl_var("crypto"), "tkip+aes"))
+               else if (nvram_match(wl_var("crypto"), "tkip+aes") || nvram_match(wl_var("crypto"), "aes+tkip"))

                        val = TKIP_ENABLED | AES_ENABLED;
                else
                        val = 0;
                        val = TKIP_ENABLED | AES_ENABLED;
                else
                        val = 0;