jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unconfigurable cts_protection_type

Browse source 
This was included in the AP configuration parameters, but there has
been no way to set it to anything else than the default automatic
mode. Remove this parameter and just hardcode ERP determination to
follow the automatic mode.
This commit is contained in:
Jouni Malinen 2011-10-29 11:24:53 +03:00
parent c48183fca2
commit 735f652237
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/ap_config.h
View file

@ -381,12 +381,6 @@ struct hostapd_config {
LONG_PREAMBLE = 0, LONG_PREAMBLE = 0,
SHORT_PREAMBLE = 1 SHORT_PREAMBLE = 1
} preamble; } preamble;
enum {
CTS_PROTECTION_AUTOMATIC = 0,
CTS_PROTECTION_FORCE_ENABLED = 1,
CTS_PROTECTION_FORCE_DISABLED = 2,
CTS_PROTECTION_AUTOMATIC_NO_OLBC = 3,
} cts_protection_type;
int *supported_rates; int *supported_rates;
int *basic_rates; int *basic_rates;

22
src/ap/beacon.c
View file

@ -45,23 +45,11 @@ static u8 ieee802_11_erp_info(struct hostapd_data *hapd)
hapd->iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G) hapd->iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
return 0; return 0;
switch (hapd->iconf->cts_protection_type) { if (hapd->iface->olbc)
case CTS_PROTECTION_FORCE_ENABLED: erp |= ERP_INFO_USE_PROTECTION;
erp |= ERP_INFO_NON_ERP_PRESENT | ERP_INFO_USE_PROTECTION; if (hapd->iface->num_sta_non_erp > 0) {
break; erp |= ERP_INFO_NON_ERP_PRESENT |
case CTS_PROTECTION_FORCE_DISABLED: ERP_INFO_USE_PROTECTION;
erp = 0;
break;
case CTS_PROTECTION_AUTOMATIC:
if (hapd->iface->olbc)
erp |= ERP_INFO_USE_PROTECTION;
/* continue */
case CTS_PROTECTION_AUTOMATIC_NO_OLBC:
if (hapd->iface->num_sta_non_erp > 0) {
erp |= ERP_INFO_NON_ERP_PRESENT |
ERP_INFO_USE_PROTECTION;
}
break;
} }
if (hapd->iface->num_sta_no_short_preamble > 0 || if (hapd->iface->num_sta_no_short_preamble > 0 ||
hapd->iconf->preamble == LONG_PREAMBLE) hapd->iconf->preamble == LONG_PREAMBLE)