Replace SSID_LEN with SSID_MAX_LEN

This makes source code more consistent.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
index 11e745eb244374a93556aff6b50d3de5f0a96287..e7478064fc38f6d63d864efb15665cd3e866d2ea 100644 (file)
--- a/src/ap/wpa_auth.h
+++ b/src/ap/wpa_auth.h
@@ -12,6 +12,7 @@
 #include "common/defs.h"
 #include "common/eapol_common.h"
 #include "common/wpa_common.h"
+#include "common/ieee802_11_defs.h"
 
 #ifdef _MSC_VER
 #pragma pack(push, 1)
@@ -146,8 +147,7 @@ struct wpa_auth_config {
        int group_mgmt_cipher;
 #endif /* CONFIG_IEEE80211W */
 #ifdef CONFIG_IEEE80211R
-#define SSID_LEN 32
-       u8 ssid[SSID_LEN];
+       u8 ssid[SSID_MAX_LEN];
        size_t ssid_len;
        u8 mobility_domain[MOBILITY_DOMAIN_ID_LEN];
        u8 r0_key_holder[FT_R0KH_ID_MAX_LEN];

diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index d417a72d91b0e7234a74e4d557c9b40fb3c08316..7cd0b6cf107ae6353ae871b02aced063a022763e 100644 (file)
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -54,8 +54,8 @@ static void hostapd_wpa_auth_conf(struct hostapd_bss_config *conf,
 #endif /* CONFIG_IEEE80211W */
 #ifdef CONFIG_IEEE80211R
        wconf->ssid_len = conf->ssid.ssid_len;
-       if (wconf->ssid_len > SSID_LEN)
-               wconf->ssid_len = SSID_LEN;
+       if (wconf->ssid_len > SSID_MAX_LEN)
+               wconf->ssid_len = SSID_MAX_LEN;
        os_memcpy(wconf->ssid, conf->ssid.ssid, wconf->ssid_len);
        os_memcpy(wconf->mobility_domain, conf->mobility_domain,
                  MOBILITY_DOMAIN_ID_LEN);