hostapd,madwifi: rename agmode option to hwmode. 11a and 11g aren't the only allowed...

[openwrt/openwrt.git] / 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 379ec0747b437db4cdbcb635363b1305d9dcc302..db7f057940087a320754eb69f2385d6eb8ddba8c 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -42,7 +42,7 @@ scan_atheros() {
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
+       config_set "$device" vifs "${sta:+$sta }${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
@@ -50,18 +50,14 @@ disable_atheros() (
        local device="$1"
 
        set_wifi_down "$device"
-       # kill all running hostapd and wpa_supplicant processes that
-       # are running on atheros vifs 
-       for pid in `pidof hostapd wpa_supplicant`; do
-               grep ath /proc/$pid/cmdline >/dev/null && \
-                       kill $pid
-       done
        
        include /lib/network
        cd /proc/sys/net
        for dev in *; do
                grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
-                       ifconfig "$dev" down 
+                       [ -f "/var/run/wifi-${dev}.pid" ] &&
+                               kill "$(cat "/var/run/wifi-${dev}.pid")"
+                       ifconfig "$dev" down
                        unbridge "$dev"
                        wlanconfig "$dev" destroy
                }
@@ -99,22 +95,22 @@ enable_atheros() {
                config_set "$vif" ifname "$ifname"
 
                # only need to change freq band and channel on the first vif
-               config_get agmode "$device" agmode
-               [ -z "$agmode" ] && config_get agmode "$device" mode
+               config_get hwmode "$device" hwmode
+               [ -z "$hwmode" ] && config_get hwmode "$device" mode
 
                pureg=0
-               case "$agmode" in
-                       *b) agmode=11b;;
-                       *bg) agmode=11g;;
-                       *g) agmode=11g; pureg=1;;
-                       *gdt) agmode=11gdt;;
-                       *a) agmode=11a;;
-                       *adt) agmode=11adt;;
-                       *ast) agmode=11ast;;
-                       *fh) agmode=fh;;
-                       *) agmode=auto;;
+               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 "$agmode"
+               iwpriv "$ifname" mode "$hwmode"
                iwpriv "$ifname" pureg "$pureg"
 
                [ "$first" = 1 ] && {
@@ -186,25 +182,23 @@ enable_atheros() {
                esac
                if [ -n "$antgpio" ]; then
                        softled=0
-                       config_get polarity "$device" polarity
-                       case "$polarity" in
+                       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
-                       config_get antenna "$device" antenna
+                       
                        [ -x "$(which gpioctl 2>/dev/null)" ] || antenna=
                        case "$antenna" in
-                               internal)
+                               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
-                                       antdiv=0
-                                       antrx=1
-                                       anttx=1
                                ;;
                        esac
                fi
@@ -217,9 +211,6 @@ enable_atheros() {
                config_get distance "$device" distance
                [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
 
-               config_get txpwr "$vif" txpower
-               [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
-
                config_get rate "$vif" rate
                [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
 
@@ -283,6 +274,11 @@ enable_atheros() {
                esac
 
                ifconfig "$ifname" up
+
+               # TXPower settings only work if device is up already
+               config_get txpwr "$vif" txpower
+               [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
+
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
@@ -334,8 +330,7 @@ detect_atheros() {
                        NanoStation*)
                                EXTRA_DEV="
 # Ubiquiti NanoStation features
-       option antenna  internal
-       option polarity auto # (auto|horizontal|vertical)
+       option antenna  auto # (auto|horizontal|vertical|external)
 "
                        ;;
                esac