remove unnecessary linux config include (it broke 'make download')

[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 07a6cd7..41a25a4 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -71,6 +71,7 @@ disable_atheros() (
 )
 
 enable_atheros() {
 )
 
 enable_atheros() {

+       local device="$1"

        config_get channel "$device" channel
        config_get vifs "$device" vifs
        
        config_get channel "$device" channel
        config_get vifs "$device" vifs
        


@@ -93,7 +94,7 @@ enable_atheros() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif

-                       config_get agmode "$device" mode
+                       config_get agmode "$device" agmode

                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;


@@ -102,7 +103,7 @@ enable_atheros() {
                                *a) agmode=11a;;
                                *) agmode=auto;;
                        esac
                                *a) agmode=11a;;
                                *) agmode=auto;;
                        esac

-                       iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null 
+                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 

                        ifconfig "$ifname" up
                        sleep 1
                        iwpriv "$ifname" mode "$agmode"
                        ifconfig "$ifname" up
                        sleep 1
                        iwpriv "$ifname" mode "$agmode"


@@ -156,10 +157,8 @@ enable_atheros() {
                esac
                config_get ssid "$vif" ssid
 
                esac
                config_get ssid "$vif" ssid
 

-               [ "$mode" = "sta" ] && {
-                       config_get_bool bgscan "$vif" bgscan 1
-                       iwpriv "$ifname" bgscan "$bgscan"
-               }
+               config_get_bool bgscan "$vif" bgscan 0
+               iwpriv "$ifname" bgscan "$bgscan"

 
                config_get_bool antdiv "$device" diversity 1
                sysctl -w dev."$device".diversity="$antdiv" >&-
 
                config_get_bool antdiv "$device" diversity 1
                sysctl -w dev."$device".diversity="$antdiv" >&-


@@ -226,10 +225,15 @@ enable_atheros() {
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)

-                                                               proto='proto=WPA';;
+                                                               proto='proto=WPA'
+                                                               passphrase="${key}"
+                                                               ;;

                                                        PSK2|psk2)
                                                        PSK2|psk2)

-                                                               proto='proto=RSN';;
+                                                               proto='proto=RSN'
+                                                               passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+                                                               ;;

                                                esac
                                                esac

+                                               

                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant
 network={
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
 ctrl_interface=/var/run/wpa_supplicant
 network={


@@ -237,7 +241,7 @@ network={
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto

-       psk="$key"
+       psk="$passphrase"

 }
 EOF
                                        ;;
 }
 EOF
                                        ;;


@@ -245,7 +249,7 @@ EOF
                                                #add wpa_supplicant calls here
                                        ;;
                                esac
                                                #add wpa_supplicant calls here
                                        ;;
                                esac

-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf

                        ;;
                esac
                first=0
                        ;;
                esac
                first=0