X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fmadwifi%2Ffiles%2Flib%2Fwifi%2Fmadwifi.sh;h=4d390dd1da2e7cc5aadd975ed3f3180d4b703301;hb=11db7aaeeb84382544cc4a14f8779544cdca9e5d;hp=7056611f638a6732dc0544f03506501bca2047ab;hpb=d2f146129a84e19b922853884832ecb472763231;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 7056611f63..4d390dd1da 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -87,33 +87,61 @@ enable_atheros() { config_get_bool antdiv "$device" diversity config_get antrx "$device" rxantenna config_get anttx "$device" txantenna - config_get_bool softled "$device" softled 1 + config_get_bool softled "$device" softled + config_get antenna "$device" antenna devname="$(cat /proc/sys/dev/$device/dev_name)" - antgpio= + local antgpio= + local invert= case "$devname" in - NanoStation2) antgpio=7;; - NanoStation5) antgpio=1;; + NanoStation2) antgpio=7; invert=1;; + NanoStation5) antgpio=1; invert=1;; + "NanoStation Loco2") antgpio=2;; + "NanoStation Loco5") + case "$antenna" in + horizontal) antdiv=0; anttx=1; antrx=1;; + vertical) antdiv=0; anttx=2; antrx=2;; + *) antdiv=1; anttx=0; antrx=0;; + esac + ;; esac + if [ -n "$invert" ]; then + _set="clear" + _clear="set" + else + _set="set" + _clear="clear" + fi if [ -n "$antgpio" ]; then softled=0 - config_get antenna "$device" antenna - case "$antenna" in - external) antdiv=0; antrx=1; anttx=1 ;; - horizontal) antdiv=0; antrx=1; anttx=1 ;; - vertical) antdiv=0; antrx=2; anttx=2 ;; - auto) antdiv=1; antrx=0; anttx=0 ;; + case "$devname" in + "NanoStation Loco2") + antdiv=0 + antrx=1 + anttx=1 + case "$antenna" in + horizontal) gpioval=0;; + *) gpioval=1;; + esac + ;; + *) + case "$antenna" in + external) antdiv=0; antrx=1; anttx=1; gpioval=1;; + horizontal) antdiv=0; antrx=1; anttx=1; gpioval=0;; + vertical) antdiv=0; antrx=2; anttx=2; gpioval=0;; + auto) antdiv=1; antrx=0; anttx=0; gpioval=0;; + esac + ;; esac [ -x "$(which gpioctl 2>/dev/null)" ] || antenna= - case "$antenna" in - horizontal|vertical|auto) - gpioctl "dirout" "$antgpio" >/dev/null 2>&1 - gpioctl "set" "$antgpio" >/dev/null 2>&1 + gpioctl "dirout" "$antgpio" >/dev/null 2>&1 + case "$gpioval" in + 0) + gpioctl "$_clear" "$antgpio" >/dev/null 2>&1 ;; - external) - gpioctl "dirout" "$antgpio" >/dev/null 2>&1 - gpioctl "clear" "$antgpio" >/dev/null 2>&1 + 1) + gpioctl "$_set" "$antgpio" >/dev/null 2>&1 ;; esac fi @@ -126,7 +154,6 @@ enable_atheros() { config_get distance "$device" distance [ -n "$distance" ] && sysctl -w dev."$device".distance="$distance" >&- - local first=1 for vif in $vifs; do local start_hostapd= vif_txpower= nosbeacon= config_get ifname "$vif" ifname @@ -135,10 +162,11 @@ enable_atheros() { config_get mode "$vif" mode case "$mode" in - sta) config_get nosbeacon "$device" nosbeacon;; - adhoc) config_get nosbeacon "$vif" sw_merge;; + sta) config_get_bool nosbeacon "$device" nosbeacon;; + adhoc) config_get_bool nosbeacon "$vif" sw_merge 1;; esac + [ "$nosbeacon" = 1 ] || nosbeacon="" ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon}) [ $? -ne 0 ] && { echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2 @@ -146,29 +174,26 @@ enable_atheros() { } config_set "$vif" ifname "$ifname" - # only need to change freq band and channel on the first vif - [ "$first" = 1 ] && { config_get hwmode "$device" hwmode [ -z "$hwmode" ] && config_get hwmode "$device" mode - pureg=0 - case "$hwmode" in - *b) hwmode=11b;; - *bg) hwmode=11g;; - *g) hwmode=11g; pureg=1;; - *gdt) hwmode=11gdt;; - *a) hwmode=11a;; - *adt) hwmode=11adt;; - *ast) hwmode=11ast;; - *fh) hwmode=fh;; - *) hwmode=auto;; - esac - iwpriv "$ifname" mode "$hwmode" - iwpriv "$ifname" pureg "$pureg" + pureg=0 + case "$hwmode" in + *b) hwmode=11b;; + *bg) hwmode=11g;; + *g) hwmode=11g; pureg=1;; + *gdt) hwmode=11gdt;; + *a) hwmode=11a;; + *adt) hwmode=11adt;; + *ast) hwmode=11ast;; + *fh) hwmode=fh;; + *) hwmode=auto;; + esac + iwpriv "$ifname" mode "$hwmode" + iwpriv "$ifname" pureg "$pureg" + + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null - iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null - } - config_get_bool hidden "$vif" hidden 0 iwpriv "$ifname" hide_ssid "$hidden" @@ -182,7 +207,7 @@ enable_atheros() { 1|on|enabled) wds=1;; *) wds=0;; esac - iwpriv "$ifname" wds "$wds" + iwpriv "$ifname" wds "$wds" >/dev/null 2>&1 [ "$mode" = ap -a "$wds" = 1 ] && { config_get_bool wdssep "$vif" wdssep 1 @@ -190,7 +215,11 @@ enable_atheros() { } case "$enc" in - WEP|wep) + wep*) + case "$enc" in + *open*) iwpriv "$ifname" authmode 1;; + *) iwpriv "$ifname" authmode 2;; + ;; for idx in 1 2 3 4; do config_get key "$vif" "key${idx}" iwconfig "$ifname" enc "[$idx]" "${key:-off}" @@ -217,6 +246,9 @@ enable_atheros() { ;; esac + config_get_bool uapsd "$vif" uapsd 0 + iwpriv "$ifname" uapsd "$uapsd" + config_get_bool bgscan "$vif" bgscan [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan" @@ -232,8 +264,8 @@ enable_atheros() { config_get rts "$vif" rts [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}" - config_get_bool comp "$vif" compression - [ -n "$comp" ] && iwpriv "$ifname" compression "$comp" + config_get_bool comp "$vif" compression 0 + iwpriv "$ifname" compression "$comp" >/dev/null 2>&1 config_get_bool minrate "$vif" minrate [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate" @@ -339,7 +371,6 @@ enable_atheros() { fi ;; esac - first=0 done } @@ -351,6 +382,18 @@ detect_atheros() { config_get type "$dev" type devname="$(cat /proc/sys/dev/$dev/dev_name)" case "$devname" in + "NanoStation Loco2") + EXTRA_DEV=" +# Ubiquiti NanoStation Loco2 features + option antenna vertical # (horizontal|vertical) +" + ;; + "NanoStation Loco5") + EXTRA_DEV=" +# Ubiquiti NanoStation Loco5 features + option antenna auto # (auto|horizontal|vertical) +" + ;; NanoStation*) EXTRA_DEV=" # Ubiquiti NanoStation features