aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-12-29 22:23:10 (GMT)
committerJouni Malinen <j@w1.fi>2016-12-29 22:23:10 (GMT)
commit2977f5193a5652d9ffa7f6cb5f3579215228f641 (patch)
tree1630dea86f02d422fee20a8e70b9a3478e852c92 /hostapd
parent678dcebedd46fe8dca0170dc6cf43a2defa8d87a (diff)
downloadhostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.zip
hostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.tar.gz
hostap-2977f5193a5652d9ffa7f6cb5f3579215228f641.tar.bz2
GAS: Remove unnecessarily duplicate gas_frag_limit configuration
The actual BSS configuration parameter can be updated with the SET control interface command, so there is no need to maintain a separate per-BSS parameter and a separate control interface handling for this. Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/config_file.c10
-rw-r--r--hostapd/ctrl_iface.c8
2 files changed, 9 insertions, 9 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index e1f9f64..7e68b38 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3298,7 +3298,15 @@ static int hostapd_config_fill(struct hostapd_config *conf,
if (parse_anqp_elem(bss, pos, line) < 0)
return 1;
} else if (os_strcmp(buf, "gas_frag_limit") == 0) {
- bss->gas_frag_limit = atoi(pos);
+ int val = atoi(pos);
+
+ if (val <= 0) {
+ wpa_printf(MSG_ERROR,
+ "Line %d: Invalid gas_frag_limit '%s'",
+ line, pos);
+ return 1;
+ }
+ bss->gas_frag_limit = val;
} else if (os_strcmp(buf, "gas_comeback_delay") == 0) {
bss->gas_comeback_delay = atoi(pos);
} else if (os_strcmp(buf, "qos_map_set") == 0) {
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 164e10d..64d0210 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1352,14 +1352,6 @@ static int hostapd_ctrl_iface_set(struct hostapd_data *hapd, char *cmd)
wpa_printf(MSG_DEBUG, "WPS: Testing - wps_corrupt_pkhash=%d",
wps_corrupt_pkhash);
#endif /* CONFIG_WPS_TESTING */
-#ifdef CONFIG_INTERWORKING
- } else if (os_strcasecmp(cmd, "gas_frag_limit") == 0) {
- int val = atoi(value);
- if (val <= 0)
- ret = -1;
- else
- hapd->gas_frag_limit = val;
-#endif /* CONFIG_INTERWORKING */
#ifdef CONFIG_TESTING_OPTIONS
} else if (os_strcasecmp(cmd, "ext_mgmt_frame_handling") == 0) {
hapd->ext_mgmt_frame_handling = atoi(value);