mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-17 17:31:27 +00:00
86 lines
2.9 KiB
Diff
86 lines
2.9 KiB
Diff
From 56994b4ac2ad1966065f4a09977fcd5102b052ab Mon Sep 17 00:00:00 2001
|
|
From: Aloka Dixit <alokad@codeaurora.org>
|
|
Date: Fri, 11 Dec 2020 11:49:08 -0800
|
|
Subject: [PATCH 6/9] hostapd: Change storage class of multiple BSSID functions
|
|
|
|
This patch changes the variables and input parameters used for length
|
|
from int to size_t.
|
|
|
|
Signed-off-by: Aloka Dixit <alokad@codeaurora.org>
|
|
---
|
|
src/ap/beacon.c | 2 +-
|
|
src/ap/ieee802_11.c | 25 +++++++++++++------------
|
|
src/ap/ieee802_11.h | 6 +++---
|
|
3 files changed, 17 insertions(+), 16 deletions(-)
|
|
|
|
--- a/src/ap/beacon.c
|
|
+++ b/src/ap/beacon.c
|
|
@@ -1817,7 +1817,7 @@ int ieee802_11_build_ap_params(struct ho
|
|
}
|
|
|
|
if (hapd->iconf->multiple_bssid) {
|
|
- int len;
|
|
+ size_t len;
|
|
u8 *end;
|
|
|
|
params->multiple_bssid_index = hostapd_get_bss_index(hapd);
|
|
--- a/src/ap/ieee802_11.c
|
|
+++ b/src/ap/ieee802_11.c
|
|
@@ -7070,15 +7070,15 @@ int hostapd_config_read_maclist(const ch
|
|
}
|
|
|
|
|
|
-static int hostapd_eid_multiple_bssid_chunk_len(struct hostapd_data *hapd,
|
|
- struct hostapd_data *req_bss,
|
|
- int *count, u8 is_beacon,
|
|
- const u8 *known_bssids,
|
|
- u8 known_bssids_len)
|
|
+static size_t hostapd_eid_multiple_bssid_chunk_len(struct hostapd_data *hapd,
|
|
+ struct hostapd_data *req_bss,
|
|
+ int *count, u8 is_beacon,
|
|
+ const u8 *known_bssids,
|
|
+ u8 known_bssids_len)
|
|
{
|
|
/* ID + size + count */
|
|
- int i, j, len = 3, nontx_profile_len;
|
|
- size_t ies_len = 0;
|
|
+ int i, j;
|
|
+ size_t ies_len = 0, len = 3, nontx_profile_len;
|
|
u8 mask;
|
|
struct hostapd_data *bss;
|
|
struct hostapd_bss_config *conf;
|
|
@@ -7132,12 +7132,13 @@ multiple_bssid_too_big:
|
|
}
|
|
|
|
|
|
-int hostapd_eid_multiple_bssid_len(struct hostapd_data *hapd,
|
|
- struct hostapd_data *req_bss,
|
|
- u8 is_beacon, const u8 *known_bssids,
|
|
- u8 known_bssids_len)
|
|
+size_t hostapd_eid_multiple_bssid_len(struct hostapd_data *hapd,
|
|
+ struct hostapd_data *req_bss,
|
|
+ u8 is_beacon, const u8 *known_bssids,
|
|
+ u8 known_bssids_len)
|
|
{
|
|
- int count = 1, len = 0;
|
|
+ int count = 1;
|
|
+ size_t len = 0;
|
|
|
|
while (count < hapd->iface->num_bss)
|
|
len += hostapd_eid_multiple_bssid_chunk_len(hapd, req_bss,
|
|
--- a/src/ap/ieee802_11.h
|
|
+++ b/src/ap/ieee802_11.h
|
|
@@ -134,9 +134,9 @@ u8 * hostapd_eid_multiple_bssid(struct h
|
|
u8 is_beacon, u8 **eid_offsets, int *eid_count,
|
|
int eid_max, u8 ema_beacon,
|
|
const u8 *known_bssids, u8 known_bssids_len);
|
|
-int hostapd_eid_multiple_bssid_len(struct hostapd_data *hapd,
|
|
- struct hostapd_data *req_bss, u8 is_beacon,
|
|
- const u8 *known_bssids, u8 known_bssids_len);
|
|
+size_t hostapd_eid_multiple_bssid_len(struct hostapd_data *hapd,
|
|
+ struct hostapd_data *req_bss, u8 is_beacon,
|
|
+ const u8 *known_bssids, u8 known_bssids_len);
|
|
u8 * hostapd_eid_rnr(struct hostapd_data *hapd, u8 *eid, u32 type);
|
|
size_t hostapd_eid_rnr_len(struct hostapd_data *hapd, u32 type);
|
|
int auth_sae_init_committed(struct hostapd_data *hapd, struct sta_info *sta);
|