From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 13 Aug 2011 23:20:45 +0000 (+0000)
Subject: merge r27976
X-Git-Tag: backfire_10.03.1~149
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0af231e88a9df00b4ddfab75df974f1d13bec4ff;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r27976

SVN-Revision: 27978
---

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 2472f8ea84..a1e298df21 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -17,7 +17,13 @@ mac80211_hostapd_setup_base() {
 	config_get basic_rate_list "$device" basic_rate
 	config_get_bool noscan "$device" noscan
 	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
-	[ "$channel" = auto ] && channel=
+
+	[ "$channel" = auto ] && {
+		channel=$(iw phy "$phy" info | \
+			sed -ne '/MHz/ { /disabled\|passive\|radar/d; s/.*\[//; s/\].*//; p; q }')
+		config_set "$device" channel "$channel"
+	}
+
 	[ -n "$hwmode" ] && {
 		config_get hwmode_11n "$device" hwmode_11n
 		[ -n "$hwmode_11n" ] && {