diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-03-27 21:14:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-27 21:14:59 +0000 |
| commit | ca749bea976300c4c5c2b67e132aefdda8ce1f3e (patch) | |
| tree | 54a9fed2fd41fb18060e83827a22af4d3f3202d6 /package/hostapd | |
| parent | 4aab5d7c49e7de258cc5c20d95dec0d0138cff2f (diff) | |
| download | upstream-ca749bea976300c4c5c2b67e132aefdda8ce1f3e.tar.gz upstream-ca749bea976300c4c5c2b67e132aefdda8ce1f3e.tar.bz2 upstream-ca749bea976300c4c5c2b67e132aefdda8ce1f3e.zip | |
wifi: fix hostapd + autochannel
SVN-Revision: 15055
Diffstat (limited to 'package/hostapd')
| -rw-r--r-- | package/hostapd/files/hostapd.sh | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index afd72fa1ad..0008a22fb3 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -77,32 +77,28 @@ hostapd_setup_vif() { config_get channel "$device" channel config_get hwmode "$device" hwmode config_get country "$device" country - case "$hwmode" in - 11a) hwmode=a;; - 11b) hwmode=b;; - 11g) hwmode=g;; - 11n) - hwmode=g - append hostapd_cfg "ieee80211n=1" "$N" + [ "$channel" = auto ] && channel= + [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" + [ -n "$hwmode" ] && { + config_get hwmode_11n "$device" hwmode_11n + [ -n "$hwmode_11n" ] && { + hwmode="$hwmode_11n" config_get ht_capab "$device" ht_capab - ;; - *) - hwmode= - [ "$channel" -gt 14 ] && hwmode=a - ;; - esac + } + } cat > /var/run/hostapd-$ifname.conf <<EOF ctrl_interface=/var/run/hostapd-$ifname driver=$driver interface=$ifname -hw_mode=${hwmode:-g} -channel=$channel +${hwmode:+hw_mode=$hwmode} +${channel:+channel=$channel} ${bridge:+bridge=$bridge} ssid=$ssid debug=0 wpa=$wpa ${crypto:+wpa_pairwise=$crypto} ${country:+country_code=$country} +${hwmode_11n:+ieee80211n=1} ${ht_capab:+ht_capab=$ht_capab} $hostapd_cfg EOF |