-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Here's my proposal:
Index: package/hostapd/files/hostapd.sh
===================================================================
- --- package/hostapd/files/hostapd.sh (revision 26771)
+++ package/hostapd/files/hostapd.sh (working copy)
@@ -136,9 +136,14 @@
config_get ssid "$vif" ssid
config_get bridge "$vif" bridge
- - config_get ieee80211d "$vif" ieee80211d
config_get iapp_interface "$vif" iapp_interface
+ config_get country_ie "$device" country
+ [ -n "$country_ie" ] && country_ie=1 || country_ie=0
+
+ config_get_bool ieee80211d "$vif" ieee80211d $country_ie
+ [ "$ieee80211d" = 0 ] && ieee80211d=""
+
config_get_bool wps_pbc "$vif" wps_pushbutton 0
config_get_bool wps_label "$vif" wps_label 0
Index: package/mac80211/files/lib/wifi/mac80211.sh
===================================================================
- --- package/mac80211/files/lib/wifi/mac80211.sh (revision 26771)
+++ package/mac80211/files/lib/wifi/mac80211.sh (working copy)
@@ -36,11 +36,6 @@
}
}
- - local country_ie=0
- - [ -n "$country" ] && country_ie=1
- - config_get_bool country_ie "$device" country_ie "$country_ie"
- - [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N"
- -
config_get macfilter "$vif" macfilter
case "$macfilter" in
allow)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk2344wACgkQdputYINPTPPkfgCgp+EsxqX64a651T76tRdE3m/8
FBAAn0bHTWl0F8wSPf/2Tq053URVitbB
=yEE5
-----END PGP SIGNATURE-----
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
