bump wificonf version number, remove wl0_wet variable support

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2023 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/wificonf/Makefile b/openwrt/package/wificonf/Makefile
index 4dd4529..f660833 100644 (file)
--- a/openwrt/package/wificonf/Makefile
+++ b/openwrt/package/wificonf/Makefile
@@ -3,7 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wificonf
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wificonf

-PKG_RELEASE:=4
+PKG_RELEASE:=5

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf
 

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 0d652ee..6bb26b1 100644 (file)
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -430,7 +430,7 @@ void set_wext_mode(skfd, ifname)
        /* Set operation mode */
        ap = !nvram_match(wl_var("mode"), "sta") && !nvram_match(wl_var("mode"), "wet");
        infra = !nvram_disabled(wl_var("infra"));
        /* Set operation mode */
        ap = !nvram_match(wl_var("mode"), "sta") && !nvram_match(wl_var("mode"), "wet");
        infra = !nvram_disabled(wl_var("infra"));

-       wet = nvram_enabled(wl_var("wet")) || !nvram_match(wl_var("mode"), "wet");
+       wet = nvram_match(wl_var("mode"), "wet");

 
        wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
        IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");
 
        wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
        IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");