summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-21 15:55:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-21 15:55:03 +0000
commitc53c7a0fe0e626801c7d3de9cf14aad0665648c1 (patch)
tree4e308ec788e7c811b6598fc57a7106c2819e47a6
parent5a6f00b84669e8a095aee650c022a473a81f6069 (diff)
downloadmaster-31e0f0ae-c53c7a0fe0e626801c7d3de9cf14aad0665648c1.tar.gz
master-31e0f0ae-c53c7a0fe0e626801c7d3de9cf14aad0665648c1.tar.bz2
master-31e0f0ae-c53c7a0fe0e626801c7d3de9cf14aad0665648c1.zip
hostapd: add pbc_in_m1 option
Option pbc_in_m1 is being used as a WPS capability discovery workaround for PBC with Windows 7. Add possibility to enable this workaround from UCI. To enable it, turn on wps and set wps_pbc_in_m1 parameter to 1. Signed-off-by: Pawel Kulakowski <pawel.kulakowski@tieto.com> SVN-Revision: 39995
-rw-r--r--package/network/services/hostapd/files/netifd.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index f06b2ac784..e6921efb53 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -120,7 +120,7 @@ hostapd_common_add_bss_config() {
config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
- config_add_boolean wps_pushbutton wps_label ext_registrar
+ config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1
config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout
@@ -145,7 +145,7 @@ hostapd_set_bss_options() {
json_get_vars \
wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \
maxassoc max_inactivity disassoc_low_ack isolate auth_cache \
- wps_pushbutton wps_label ext_registrar \
+ wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
wps_device_type wps_device_name wps_manufacturer wps_pin \
macfilter ssid wmm hidden short_preamble
@@ -279,6 +279,7 @@ hostapd_set_bss_options() {
append bss_conf "device_name=$wps_device_name" "$N"
append bss_conf "manufacturer=$wps_manufacturer" "$N"
append bss_conf "config_methods=$config_methods" "$N"
+ [ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N"
}
append bss_conf "ssid=$ssid" "$N"