[cavium-octeon] enable command line mtd partitionning and enable bridging

[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 2fe8664..24d371b 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -75,8 +75,7 @@ enable_atheros() {
        [ -z "$country" ] && country="0"
        echo "$country" > /proc/sys/dev/$device/countrycode
 
        [ -z "$country" ] && country="0"
        echo "$country" > /proc/sys/dev/$device/countrycode
 

-       config_get outdoor "$device" outdoor
-       [ -z "$outdoor" ] && outdoor="0"
+       config_get_bool outdoor "$device" outdoor "0"

        echo "$outdoor" > /proc/sys/dev/$device/outdoor
 
        config_get channel "$device" channel
        echo "$outdoor" > /proc/sys/dev/$device/outdoor
 
        config_get channel "$device" channel


@@ -222,7 +221,7 @@ enable_atheros() {
                [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&-
 
                config_get distance "$device" distance
                [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&-
 
                config_get distance "$device" distance

-               [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
+               [ -n "$distance" ] && sysctl -w dev."$device".distance="$distance" >&-

 
                config_get rate "$vif" rate
                [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
 
                config_get rate "$vif" rate
                [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"


@@ -301,8 +300,10 @@ enable_atheros() {
                        config_set "$vif" bridge "$bridge"
                        start_net "$ifname" "$net_cfg"
                }
                        config_set "$vif" bridge "$bridge"
                        start_net "$ifname" "$net_cfg"
                }

-               [ -n "$ssid" ] && iwconfig "$ifname" essid on
-               iwconfig "$ifname" essid "$ssid"
+               [ -n "$ssid" ] && {
+                       iwconfig "$ifname" essid on
+                       iwconfig "$ifname" essid "$ssid"
+               }

                set_wifi_up "$vif" "$ifname"
 
                # TXPower settings only work if device is up already
                set_wifi_up "$vif" "$ifname"
 
                # TXPower settings only work if device is up already