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

SVN-Revision: 29606
This commit is contained in:
Felix Fietkau 2011-12-23 19:24:38 +00:00
parent 11125d68ed
commit e7c63048df

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,8 +433,6 @@ 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
ifconfig "$ifname" up
case "$mode" in case "$mode" in
adhoc) adhoc)
config_get bssid "$vif" bssid config_get bssid "$vif" bssid
@ -508,8 +505,7 @@ enable_mac80211() {
fi fi
;; ;;
esac esac
mac80211_start_vif "$vif" "$ifname" [ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname"
fi
done done
} }