qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:33:10 +02:00
Code

mac80211: clean up init, remove some redundant checks, fix tx power init (#10113)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29606 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-12-23 19:24:38 +00:00
parent 71a38e2476
commit 5c56c7216a
1 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
package/mac80211/files/lib/wifi/mac80211.sh
View File

@ -425,8 +425,7 @@ enable_mac80211() {
for vif in $vifs; do for vif in $vifs; do
config_get mode "$vif" mode config_get mode "$vif" mode
config_get ifname "$vif" ifname config_get ifname "$vif" ifname
[ ! "$mode" = "ap" ] || continue [ "$mode" = "ap" ] || ifconfig "$ifname" up
ifconfig "$ifname" up
config_get vif_txpower "$vif" txpower config_get vif_txpower "$vif" txpower
# use vif_txpower (from wifi-iface) to override txpower (from # use vif_txpower (from wifi-iface) to override txpower (from
@ -434,82 +433,79 @@ enable_mac80211() {
txpower="${txpower:-$vif_txpower}" txpower="${txpower:-$vif_txpower}"
[ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00" [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"
if [ ! "$mode" = "ap" ]; then case "$mode" in
ifconfig "$ifname" up adhoc)
case "$mode" in config_get bssid "$vif" bssid
adhoc) config_get ssid "$vif" ssid
config_get bssid "$vif" bssid config_get beacon_int "$device" beacon_int
config_get ssid "$vif" ssid config_get basic_rate_list "$device" basic_rate
config_get beacon_int "$device" beacon_int config_get encryption "$vif" encryption
config_get basic_rate_list "$device" basic_rate config_get key "$vif" key 1
config_get encryption "$vif" encryption config_get mcast_rate "$vif" mcast_rate
config_get key "$vif" key 1
config_get mcast_rate "$vif" mcast_rate
local keyspec="" local keyspec=""
[ "$encryption" == "wep" ] && { [ "$encryption" == "wep" ] && {
case "$key" in case "$key" in
[1234]) [1234])
local idx local idx
for idx in 1 2 3 4; do for idx in 1 2 3 4; do
local ikey local ikey
config_get ikey "$vif" "key$idx" config_get ikey "$vif" "key$idx"
[ -n "$ikey" ] && { [ -n "$ikey" ] && {
ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")" ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")"
[ $idx -eq $key ] && ikey="d:$ikey" [ $idx -eq $key ] && ikey="d:$ikey"
append keyspec "$ikey" append keyspec "$ikey"
} }
done done
;; ;;
*) append keyspec "d:0:$(prepare_key_wep "$key")" ;; *) append keyspec "d:0:$(prepare_key_wep "$key")" ;;
esac
}
local br brval brsub brstr
[ -n "$basic_rate_list" ] && {
for br in $basic_rate_list; do
brval="$(($br / 1000))"
brsub="$((($br / 100) % 10))"
[ "$brsub" -gt 0 ] && brval="$brval.$brsub"
[ -n "$brstr" ] && brstr="$brstr,"
brstr="$brstr$brval"
done
}
local mcval=""
[ -n "$mcast_rate" ] && {
mcval="$(($mcast_rate / 1000))"
mcsub="$(( ($mcast_rate / 100) % 10 ))"
[ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
}
config_get htmode "$device" htmode
case "$htmode" in
HT20|HT40+|HT40-) ;;
*) htmode= ;;
esac esac
}
iw dev "$ifname" ibss join "$ssid" $freq $htmode \ local br brval brsub brstr
${fixed:+fixed-freq} $bssid \ [ -n "$basic_rate_list" ] && {
${beacon_int:+beacon-interval $beacon_int} \ for br in $basic_rate_list; do
${brstr:+basic-rates $brstr} \ brval="$(($br / 1000))"
${mcval:+mcast-rate $mcval} \ brsub="$((($br / 100) % 10))"
${keyspec:+keys $keyspec} [ "$brsub" -gt 0 ] && brval="$brval.$brsub"
;; [ -n "$brstr" ] && brstr="$brstr,"
sta) brstr="$brstr$brval"
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then done
wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || { }
echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption local mcval=""
ifconfig "$ifname" down [ -n "$mcast_rate" ] && {
continue mcval="$(($mcast_rate / 1000))"
} mcsub="$(( ($mcast_rate / 100) % 10 ))"
fi [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
;; }
esac
mac80211_start_vif "$vif" "$ifname" config_get htmode "$device" htmode
fi case "$htmode" in
HT20|HT40+|HT40-) ;;
*) htmode= ;;
esac
iw dev "$ifname" ibss join "$ssid" $freq $htmode \
${fixed:+fixed-freq} $bssid \
${beacon_int:+beacon-interval $beacon_int} \
${brstr:+basic-rates $brstr} \
${mcval:+mcast-rate $mcval} \
${keyspec:+keys $keyspec}
;;
sta)
if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || {
echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption
ifconfig "$ifname" down
continue
}
fi
;;
esac
[ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname"
done done
} }