KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: fix autochannel / fixed channel selection, add commands for unencrypted sta mode

Browse source 
SVN-Revision: 18024
This commit is contained in:
Felix Fietkau 2009-10-11 01:01:12 +00:00
parent 4cb436429b
commit 60d9f8044c
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
package/mac80211/files/lib/wifi/mac80211.sh
View file

@ -68,8 +68,8 @@ disable_mac80211() (
) )
get_freq() { get_freq() {
local phy="$1" local phy="$1"
local channel="$2" local chan="$2"
iw "$phy" info | grep -E -m1 "(\* ${channel:-....} MHz${channel:+|\\[$channel\\]})" | grep MHz | awk '{print $2}' iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}'
} }
enable_mac80211() { enable_mac80211() {
local device="$1" local device="$1"
@ -79,9 +79,15 @@ enable_mac80211() {
find_mac80211_phy "$device" || return 0 find_mac80211_phy "$device" || return 0
config_get phy "$device" phy config_get phy "$device" phy
local i=0 local i=0
fixed=""
[ "$channel" = "auto" -o "$channel" = "0" ] || {
fixed=1
}
export channel fixed
# convert channel to frequency # convert channel to frequency
local freq="$(get_freq "$phy" "$channel")" local freq="$(get_freq "$phy" "${fixed:+$channel}")"
wifi_fixup_hwmode "$device" "g" wifi_fixup_hwmode "$device" "g"
for vif in $vifs; do for vif in $vifs; do
@ -141,7 +147,7 @@ enable_mac80211() {
# We attempt to set teh channel for all interfaces, although # We attempt to set teh channel for all interfaces, although
# mac80211 may not support it or the driver might not yet # mac80211 may not support it or the driver might not yet
[ -z "$channel" ] || iw dev "$ifname" set channel "$channel" [ -n "$fixed" ] && iw dev "$ifname" set channel "$channel"
local key keystring local key keystring
@ -222,12 +228,13 @@ enable_mac80211() {
;; ;;
adhoc) adhoc)
config_get bssid "$vif" bssid config_get bssid "$vif" bssid
iw dev "$ifname" ibss join "$ssid" ${freq:+$freq fixed-freq} $bssid iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
;; ;;
sta|mesh) sta|mesh)
# Fixup... sometimes you have to scan to get beaconing going
iw dev "$ifname" scan &> /dev/null
case "$enc" in case "$enc" in
*)
iw dev "$ifname" connect "$ssid"
;;
wep) wep)
if [ -e "$keymgmt" ]; then if [ -e "$keymgmt" ]; then
[ -n "$keystring" ] && [ -n "$keystring" ] &&