X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e25092dac1532c89b73156f6927de78a53894839..fcb4e88f44ae7fc0b4e8af1cfb5b88216acfa760:/package/madwifi/files/lib/wifi/madwifi.sh diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 62b859dae..93e68f51e 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -1,14 +1,42 @@ #!/bin/sh append DRIVERS "atheros" +find_atheros_phy() { + local device="$1" + + local macaddr="$(config_get "$device" macaddr | tr 'A-Z' 'a-z')" + config_get phy "$device" phy + [ -z "$phy" -a -n "$macaddr" ] && { + cd /proc/sys/dev + for phy in $(ls -d wifi* 2>&-); do + [ "$macaddr" = "$(cat /sys/class/net/${phy}/address)" ] || continue + config_set "$device" phy "$phy" + break + done + config_get phy "$device" phy + } + [ -n "$phy" -a -d "/proc/sys/dev/$phy" ] || { + echo "phy for wifi device $1 not found" + return 1 + } + [ -z "$macaddr" ] && { + config_set "$device" macaddr "$(cat /sys/class/net/${phy}/address)" + } + return 0 +} + scan_atheros() { local device="$1" local wds - local adhoc ahdemo sta ap monitor + local adhoc ahdemo sta ap monitor disabled + + [ ${device%[0-9]} = "wifi" ] && config_set "$device" phy "$device" config_get vifs "$device" vifs for vif in $vifs; do - + config_get_bool disabled "$vif" disabled 0 + [ $disabled = 0 ] || continue + config_get ifname "$vif" ifname config_set "$vif" ifname "${ifname:-ath}" @@ -49,12 +77,15 @@ scan_atheros() { disable_atheros() ( local device="$1" + find_atheros_phy "$device" || return 0 + config_get phy "$device" phy + set_wifi_down "$device" - + include /lib/network cd /proc/sys/net for dev in *; do - grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && { + grep "$phy" "$dev/%parent" >/dev/null 2>/dev/null && { [ -f "/var/run/wifi-${dev}.pid" ] && kill "$(cat "/var/run/wifi-${dev}.pid")" ifconfig "$dev" down @@ -68,15 +99,22 @@ disable_atheros() ( enable_atheros() { local device="$1" + find_atheros_phy "$device" || return 0 + config_get phy "$device" phy + config_get regdomain "$device" regdomain - [ -n "$regdomain" ] && echo "$regdomain" > /proc/sys/dev/$device/regdomain + [ -n "$regdomain" ] && echo "$regdomain" > /proc/sys/dev/$phy/regdomain config_get country "$device" country - [ -z "$country" ] && country="0" - echo "$country" > /proc/sys/dev/$device/countrycode + case "$country" in + [A-Za-z]*) country=`grep -i "$country" /lib/wifi/madwifi_countrycodes.txt |cut -d " " -f 2`;; + [0-9]*) ;; + *) country="" ;; + esac + [ -n "$country" ] && echo "$country" > /proc/sys/dev/$phy/countrycode config_get_bool outdoor "$device" outdoor "0" - echo "$outdoor" > /proc/sys/dev/$device/outdoor + echo "$outdoor" > /proc/sys/dev/$phy/outdoor config_get channel "$device" channel config_get vifs "$device" vifs @@ -87,89 +125,113 @@ 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= + devname="$(cat /proc/sys/dev/$phy/dev_name)" + 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 - [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&- - [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&- - [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&- - [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&- + [ -n "$antdiv" ] && sysctl -w dev."$phy".diversity="$antdiv" >&- + [ -n "$antrx" ] && sysctl -w dev."$phy".rxantenna="$antrx" >&- + [ -n "$anttx" ] && sysctl -w dev."$phy".txantenna="$anttx" >&- + [ -n "$softled" ] && sysctl -w dev."$phy".softled="$softled" >&- config_get distance "$device" distance - [ -n "$distance" ] && sysctl -w dev."$device".distance="$distance" >&- + [ -n "$distance" ] && sysctl -w dev."$phy".distance="$distance" >&- - local first=1 for vif in $vifs; do - local start_hostapd vif_txpower - nosbeacon= + local start_hostapd= vif_txpower= nosbeacon= config_get ifname "$vif" ifname config_get enc "$vif" encryption config_get eap_type "$vif" eap_type 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 - - ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon}) + + [ "$nosbeacon" = 1 ] || nosbeacon="" + ifname=$(wlanconfig "$ifname" create wlandev "$phy" wlanmode "$mode" ${nosbeacon:+nosbeacon}) [ $? -ne 0 ] && { echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2 continue } 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" @@ -183,7 +245,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 @@ -191,7 +253,11 @@ enable_atheros() { } case "$enc" in - WEP|wep) + wep*) + case "$enc" in + *shared*) iwpriv "$ifname" authmode 2;; + *) iwpriv "$ifname" authmode 1;; + esac for idx in 1 2 3 4; do config_get key "$vif" "key${idx}" iwconfig "$ifname" enc "[$idx]" "${key:-off}" @@ -217,53 +283,13 @@ enable_atheros() { } ;; esac - config_get ssid "$vif" ssid + + config_get_bool uapsd "$vif" uapsd 0 + iwpriv "$ifname" uapsd "$uapsd" config_get_bool bgscan "$vif" bgscan [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan" - config_get_bool antdiv "$device" diversity - config_get antrx "$device" rxantenna - config_get anttx "$device" txantenna - config_get_bool softled "$device" softled 1 - - devname="$(cat /proc/sys/dev/$device/dev_name)" - antgpio= - case "$devname" in - NanoStation2) antgpio=7;; - NanoStation5) antgpio=1;; - esac - 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 ;; - 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 - ;; - external) - gpioctl "dirout" "$antgpio" >/dev/null 2>&1 - gpioctl "clear" "$antgpio" >/dev/null 2>&1 - ;; - esac - fi - - [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&- - [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&- - [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&- - [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&- - - config_get distance "$device" distance - [ -n "$distance" ] && sysctl -w dev."$device".distance="$distance" >&- - config_get rate "$vif" rate [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}" @@ -276,13 +302,13 @@ 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 + config_get minrate "$vif" minrate [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate" - config_get_bool maxrate "$vif" maxrate + config_get maxrate "$vif" maxrate [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate" config_get_bool burst "$vif" bursting @@ -338,10 +364,13 @@ enable_atheros() { config_set "$vif" bridge "$bridge" start_net "$ifname" "$net_cfg" } + + config_get ssid "$vif" ssid [ -n "$ssid" ] && { iwconfig "$ifname" essid on - iwconfig "$ifname" essid "$ssid" + iwconfig "$ifname" essid ${ssid:+-- }"$ssid" } + set_wifi_up "$vif" "$ifname" # TXPower settings only work if device is up already @@ -380,18 +409,49 @@ enable_atheros() { fi ;; esac - first=0 done } +check_atheros_device() { + [ ${1%[0-9]} = "wifi" ] && config_set "$1" phy "$1" + config_get phy "$1" phy + [ -z "$phy" ] && { + find_atheros_phy "$1" >/dev/null || return 0 + config_get phy "$1" phy + } + [ "$phy" = "$dev" ] && found=1 +} + detect_atheros() { + devidx=0 + config_load wireless + while :; do + config_get type "radio$devidx" type + [ -n "$type" ] || break + devidx=$(($devidx + 1)) + done cd /proc/sys/dev [ -d ath ] || return for dev in $(ls -d wifi* 2>&-); do - config_get type "$dev" type + found=0 + config_foreach check_atheros_device wifi-device + [ "$found" -gt 0 ] && continue + 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 @@ -399,21 +459,24 @@ detect_atheros() { " ;; esac - [ "$type" = atheros ] && continue + cat <