hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

SVN-Revision: 13790
lede-17.01
Andy Boyett 2008-12-31 19:09:26 +00:00
parent 359ce7f97e
commit 35078a6a52
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/wireless.tex
View File

@ -31,7 +31,7 @@ config wifi-iface
config wifi-device "wifi0"
option type "atheros"
option channel "5"
option agmode "11g"
option hwmode "11g"
config wifi-iface
option device "wifi0"
@ -99,7 +99,7 @@ config wifi-device wifi device name
option channel 1-14
option maxassoc 1-128 (broadcom only)
option distance 1-n
option agmode 11b, 11g, 11a, 11bg (atheros only)
option hwmode 11b, 11g, 11a, 11bg (atheros, mac80211)
option rxantenna 0,1,2 (atheros, broadcom)
option txantenna 0,1,2 (atheros, broadcom)

16
package/hostapd/files/hostapd.sh
View File

@ -74,20 +74,20 @@ hostapd_setup_vif() {
config_get ssid "$vif" ssid
config_get device "$vif" device
config_get channel "$device" channel
config_get agmode "$device" agmode
case "$agmode" in
11a) agmode=a;;
11b) agmode=b;;
11g) agmode=g;;
config_get hwmode "$device" hwmode
case "$hwmode" in
11a) hwmode=a;;
11b) hwmode=b;;
11g) hwmode=g;;
*)
agmode=
[ "$channel" -gt 14 ] && agmode=a
hwmode=
[ "$channel" -gt 14 ] && hwmode=a
;;
esac
cat > /var/run/hostapd-$ifname.conf <<EOF
driver=$driver
interface=$ifname
hw_mode=${agmode:-g}
hw_mode=${hwmode:-g}
channel=$channel
${bridge:+bridge=$bridge}
ssid=$ssid

26
package/madwifi/files/lib/wifi/madwifi.sh
View File

@ -95,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 ] && {