Remove unconfigurable cts_protection_type

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.

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 7748fd7..fe20fc2 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -381,12 +381,6 @@ struct hostapd_config {
                LONG_PREAMBLE = 0,
                SHORT_PREAMBLE = 1
        } 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 *basic_rates;

diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index 528808c..4ba223c 100644 (file)
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -45,23 +45,11 @@ static u8 ieee802_11_erp_info(struct hostapd_data *hapd)
            hapd->iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
                return 0;
 
-       switch (hapd->iconf->cts_protection_type) {
-       case CTS_PROTECTION_FORCE_ENABLED:
-               erp |= ERP_INFO_NON_ERP_PRESENT | ERP_INFO_USE_PROTECTION;
-               break;
-       case CTS_PROTECTION_FORCE_DISABLED:
-               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->olbc)
+               erp |= ERP_INFO_USE_PROTECTION;
+       if (hapd->iface->num_sta_non_erp > 0) {
+               erp |= ERP_INFO_NON_ERP_PRESENT |
+                       ERP_INFO_USE_PROTECTION;
        }
        if (hapd->iface->num_sta_no_short_preamble > 0 ||
            hapd->iconf->preamble == LONG_PREAMBLE)