diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-06-23 23:12:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-06-23 23:12:33 +0000 |
| commit | 1798b545f7b085e4dd4985e3f49aa6806778eb33 (patch) | |
| tree | c9edc7e2f6bd1706b5cc39b37c5352696ac0c9cd /package/wificonf | |
| parent | 17e64394b03d0fce23e08ce53e52b999be4d9067 (diff) | |
| download | upstream-1798b545f7b085e4dd4985e3f49aa6806778eb33.tar.gz upstream-1798b545f7b085e4dd4985e3f49aa6806778eb33.tar.bz2 upstream-1798b545f7b085e4dd4985e3f49aa6806778eb33.zip | |
fix wificonf maclist, closed, ap/sta mode
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1278 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/wificonf')
| -rw-r--r-- | package/wificonf/wificonf.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package/wificonf/wificonf.c b/package/wificonf/wificonf.c index 44ca8a40df..ecf08c0b62 100644 --- a/package/wificonf/wificonf.c +++ b/package/wificonf/wificonf.c @@ -192,6 +192,9 @@ void setup_bcom(int skfd, char *ifname) bcom_ioctl(skfd, ifname, WLC_SET_ANTDIV, &val, sizeof(val)); val = atoi(nvram_safe_get(wl_var("txant"))); bcom_ioctl(skfd, ifname, WLC_SET_TXANT, &val, sizeof(val)); + + val = nvram_enabled(wl_var("closed")); + bcom_ioctl(skfd, ifname, WLC_SET_CLOSED, &val, sizeof(val)); val = nvram_enabled(wl_var("ap_isolate")); bcom_set_int(skfd, ifname, "ap_isolate", val); @@ -209,6 +212,7 @@ void setup_bcom(int skfd, char *ifname) if ((val != WLC_MACMODE_DISABLED) && (v = nvram_get(wl_var("maclist")))) { char buf[8192]; + char wbuf[80]; struct maclist *mac_list; struct ether_addr *addr; char *next; @@ -217,14 +221,12 @@ void setup_bcom(int skfd, char *ifname) mac_list = (struct maclist *) buf; addr = mac_list->ea; - v = malloc(80); - foreach(v, nvram_safe_get(wl_var("maclist")), next) { - if (ether_atoe(v, addr->ether_addr_octet)) { + foreach(wbuf, nvram_safe_get(wl_var("maclist")), next) { + if (ether_atoe(wbuf, addr->ether_addr_octet)) { mac_list->count++; addr++; } } - free(v); bcom_ioctl(skfd, ifname, WLC_SET_MACLIST, buf, sizeof(buf)); } else { val = WLC_MACMODE_DISABLED; @@ -343,18 +345,15 @@ void setup_wext(int skfd, char *ifname) /* Set operation mode */ int ap = 0, infra = 0, wet = 0; - ap = (nvram_match(wl_var("mode"), "ap") || nvram_match(wl_var("mode"), "wds")); - infra = nvram_enabled(wl_var("infra")); + ap = !nvram_match(wl_var("mode"), "sta"); + infra = !nvram_disabled(wl_var("infra")); wet = nvram_enabled(wl_var("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"); /* Disable radio if wlX_radio is set and not enabled */ - if (nvram_disabled(wl_var("radio"))) - wrq.u.txpower.disabled = 1; - else - wrq.u.txpower.disabled = 0; + wrq.u.txpower.disabled = nvram_disabled(wl_var("radio")); wrq.u.txpower.value = -1; wrq.u.txpower.fixed = 1; |