projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable openssl engine support on ixp4xx
[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
400cb77
..
5adeee4
100755
(executable)
--- a/
package/madwifi/files/lib/wifi/madwifi.sh
+++ b/
package/madwifi/files/lib/wifi/madwifi.sh
@@
-106,11
+106,10
@@
enable_atheros() {
*) agmode=auto;;
esac
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
*) agmode=auto;;
esac
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
- ifconfig "$ifname" up
- sleep 1
iwpriv "$ifname" mode "$agmode"
iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
iwpriv "$ifname" mode "$agmode"
iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
+ ifconfig "$ifname" up
}
config_get_bool hidden "$vif" hidden 0
}
config_get_bool hidden "$vif" hidden 0
@@
-197,6
+196,12
@@
enable_atheros() {
config_get_bool comp "$vif" compression
[ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
config_get_bool comp "$vif" compression
[ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
+ config_get_bool minrate "$vif" minrate
+ [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
+
+ config_get_bool maxrate "$vif" maxrate
+ [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
+
config_get_bool burst "$vif" bursting
[ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
config_get_bool burst "$vif" bursting
[ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
@@
-266,26
+271,34
@@
enable_atheros() {
fi
;;
wds|sta)
fi
;;
wds|sta)
- case "$enc" in
+ config_get_bool usepassphrase "$vif" passphrase 1
+ case "$enc" in
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
proto='proto=WPA'
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
proto='proto=WPA'
- passphrase="${key}"
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
;;
PSK2|psk2)
proto='proto=RSN'
;;
PSK2|psk2)
proto='proto=RSN'
- passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
;;
esac
;;
esac
-
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
network={
scan_ssid=1
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
network={
scan_ssid=1
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
-
psk=
$passphrase
+ $passphrase
}
EOF
;;
}
EOF
;;
This page took
0.022161 seconds
and
4
git commands to generate.